update

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

@@ -155,11 +155,9 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
         }
         if(ExamStatusEnum.DELETE.equals(statusEnum)){
             examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "删除考级项目", operatorId));
-        }
-        if(ExamStatusEnum.RESULT_CONFIRM.equals(statusEnum)){
+        }else if(ExamStatusEnum.RESULT_CONFIRM.equals(statusEnum)){
             examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "确认考试结果", operatorId));
-        }
-        if(ExamStatusEnum.CLOSE.equals(statusEnum)){
+        }else if(ExamStatusEnum.CLOSE.equals(statusEnum)){
             examLifecycleLogDao.insert(new ExamLifecycleLog(existsExam.getId().intValue(), "关闭考级项目", operatorId));
         }
         if(ExamStatusEnum.CLOSE.equals(existsExam.getStatus())){

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamLocationMapper.xml

@@ -77,7 +77,7 @@
 			<if test="search!=null">
 				AND (id_=#{search} OR name_ LIKE CONCAT('%', #{serch}, '%'))
 			</if>
-			<if test="tenantId != null">
+			<if test="tenantId != null and tenantId!=0">
 				AND tenant_id_ = #{tenantId}
 			</if>
 		</where>