添加同工种下不可以存在相同身份证号的讲师的校验规则

src/main/java/cn/com/tenlion/service/teacher/impl/TeacherServiceImpl.java

@@ -91,16 +91,25 @@ public class TeacherServiceImpl extends DefaultBaseService implements ITeacherSe
 
     @Override
     public SuccessResultData save(String token, TeacherVO teacherVO) throws Exception {
-        // 同机构下讲师不可重复
         String idCardNumber = teacherVO.getIdCardNumber();
         if(idCardNumber == null || "".equals(idCardNumber)){
             throw new SaveException("讲师证件号码不允许为空值");
         }
+        if(teacherVO.getWorkerCategoryId() == null || "".equals(teacherVO.getWorkerCategoryId())){
+            throw new SaveException("讲师授课工种不能为空值");
+        }
         Map<String, Object> queryMap = getHashMap(8);
+        // 同工种下讲师不可重复，跨工种可以重复
+        String WorkerCategoryIds[] = teacherVO.getWorkerCategoryId().split(",");
         queryMap.put("idCardNumber",idCardNumber);
+        for(int i = 0; i < WorkerCategoryIds.length;i++){
+            queryMap.put("workerCategoryId",WorkerCategoryIds[i]);
             TeacherDTO teacherDTO = teacherDao.get(queryMap);
             if(teacherDTO != null && !"".equals(teacherDTO.getTeacherId())){
-            throw new SaveException("您不能添加证件号码相同的讲师");
+                throw new SaveException("该证件号码已在 【"
+                        + teacherDTO.getWorkerCategoryName().split(",")[i]
+                        + "】 工种中注册讲师");
+            }
         }
         String teacherId = UUIDUtil.getUUID();
         Map<String, Object> params = HashMapUtil.beanToMap(teacherVO);

src/main/resources/mybatis/mapper/teacher/teacher-mapper.xml

@@ -162,6 +162,9 @@
         <if test="orgId != null and orgId != ''">
             AND t1.org_id = #{orgId}
         </if>
+        <if test="workerCategoryId != null and workerCategoryId != ''">
+            AND FIND_IN_SET( #{workerCategoryId},t1.worker_category_id)
+        </if>
         <if test="idCardNumber != null and idCardNumber != ''">
             AND t1.id_card_number = #{idCardNumber}
         </if>