Eric пре 2 година
родитељ
комит
cf681ef70f

+ 1 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/DegreeService.java

@@ -49,10 +49,9 @@ public interface DegreeService extends IService<Degree>  {
     /**
     /**
      * 学生考级信息查询
      * 学生考级信息查询
      * @param id 考级ID
      * @param id 考级ID
-     * @param organId 用户所属机构ID
      * @return DegreeWrapper.StudentDegreeInfo
      * @return DegreeWrapper.StudentDegreeInfo
      */
      */
-    DegreeWrapper.StudentDegreeInfo studentDegreeInfoById(Long id, Integer organId);
+    DegreeWrapper.StudentDegreeInfo studentDegreeInfoById(Long id);
 
 
     /**
     /**
      * 考级状态变更
      * 考级状态变更

+ 1 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeServiceImpl.java

@@ -253,11 +253,10 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
      * 学生考级信息查询
      * 学生考级信息查询
      *
      *
      * @param id 考级ID
      * @param id 考级ID
-     * @param organId 用户分部ID
      * @return DegreeWrapper.StudentDegreeInfo
      * @return DegreeWrapper.StudentDegreeInfo
      */
      */
     @Override
     @Override
-    public DegreeWrapper.StudentDegreeInfo studentDegreeInfoById(Long id, Integer organId) {
+    public DegreeWrapper.StudentDegreeInfo studentDegreeInfoById(Long id) {
 
 
         Degree degree = getById(id);
         Degree degree = getById(id);
         // 考级信息不存在
         // 考级信息不存在
@@ -296,7 +295,6 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
                 .rows(1)
                 .rows(1)
                 .status(true)
                 .status(true)
                 .tenantId(wrapper.getTenantId())
                 .tenantId(wrapper.getTenantId())
-                .organId(organId)
                 .type(DegreeNewsTypeEnum.GRADE_EXAMINATION_BRIEF.getCode())
                 .type(DegreeNewsTypeEnum.GRADE_EXAMINATION_BRIEF.getCode())
                 .sortedTime(true)
                 .sortedTime(true)
                 .build();
                 .build();

+ 1 - 1
mec-student/src/main/java/com/ym/mec/student/controller/degree/DegreeInfoController.java

@@ -56,7 +56,7 @@ public class DegreeInfoController extends BaseController {
         }
         }
 
 
         // 考级信息
         // 考级信息
-        DegreeWrapper.StudentDegreeInfo wrapper = degreeService.studentDegreeInfoById(id, user.getOrganId());
+        DegreeWrapper.StudentDegreeInfo wrapper = degreeService.studentDegreeInfoById(id);
 
 
         // 考级机构-暂未开放此活动
         // 考级机构-暂未开放此活动
         if (!user.getTenantId().equals(wrapper.getTenantId())) {
         if (!user.getTenantId().equals(wrapper.getTenantId())) {