Joburgess 5 years ago
parent
commit
76fa60200a

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

@@ -240,7 +240,7 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
 
         List<Integer> childOrganIds = organizationService.getChildOrganIds(organId, true);
 
-        if(!childOrganIds.contains(examinationBasic.getOrganId())){
+        if(Objects.nonNull(childOrganIds)&&!childOrganIds.contains(examinationBasic.getOrganId())){
             throw new BizException("删除失败");
         }
 

+ 1 - 1
edu-user/edu-user-server/src/main/resources/config/mybatis/ExamReviewMapper.xml

@@ -114,7 +114,7 @@
 				AND er.exam_registration_id_=#{registId}
 			</if>
 			<if test="examinationBaseId!=null">
-				AND ere.examination_basic_id_ = #{examinationBaseId}
+				AND er.examination_basic_id_ = #{examinationBaseId}
 			</if>
 			<if test="cardNo!=null">
 				AND ere.card_no_=#{cardNo}