Joburgess 5 роки тому
батько
коміт
7617a88aa6

+ 1 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExaminationBasicController.java

@@ -94,7 +94,7 @@ public class ExaminationBasicController extends BaseController {
             }
             organId = employee.getOrganId();
         }
-        examinationBasicService.closeExam(examId, reason);
+        examinationBasicService.closeExam(organId, examId, reason);
         return succeed();
     }
 

+ 1 - 1
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExaminationBasicService.java

@@ -62,7 +62,7 @@ public interface ExaminationBasicService extends BaseService<Long, ExaminationBa
      * @param reason: 关闭原因
      * @return void
      */
-    void closeExam(Integer examId, String reason);
+    void closeExam(Integer organId, Integer examId, String reason);
 
     /**
      * 获取考级项目信息

+ 2 - 2
edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExaminationBasicServiceImpl.java

@@ -229,7 +229,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
     }
 
     @Override
-    public void closeExam(Integer examId, String reason) {
+    public void closeExam(Integer organId, Integer examId, String reason) {
         if (Objects.isNull(examId)) {
             throw new BizException("请指定考级项目");
         }
@@ -238,7 +238,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
             throw new BizException("考级项目不存在");
         }
 
-//        List<Integer> childOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
+        List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
 
         if (StringUtils.isBlank(reason)) {
             reason = "后台手动关闭";