教职工信息：工号重复时，防重复

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/TeacherServiceImpl.java

@@ -80,7 +80,7 @@ public class TeacherServiceImpl implements TeacherService{
         //新增教师
         if (StringUtils.isEmpty(formdata.getTeacher_id()) || "0".equals(formdata.getTeacher_id().toString())) {
             if(sysTeacherMapper.count(formdata.getTeacher_number(), formdata.getSchool_id()) > 0){
-                //throw new BizException(BizExceptionCode.Repeat_Code);
+                throw new BizException(BizExceptionCode.REPEAT_TEACHER_NUMBER);
             }
             sysTeacherMapper.insertSelective(formdata);
             if (!StringUtils.isEmpty(formdata.getTeacher_phone())) {
@@ -88,11 +88,10 @@ public class TeacherServiceImpl implements TeacherService{
             }
         } else {
             //更新教师
-            /*formdata.getTeacher_number().equalsIgnoreCase()    qgformdata.getTeacher_id()
-             * if (false) {
-             *      formdata.getTeacher_number()
-             * }
-             */
+            if(sysTeacherMapper.count(formdata.getTeacher_number(), formdata.getSchool_id()) > 0 &&
+                    !(sysTeacherMapper.selectNumberByKey(formdata.getTeacher_number()).getTeacher_id().equals(formdata.getTeacher_id()))){
+                throw new BizException(BizExceptionCode.REPEAT_TEACHER_NUMBER);
+            }
             sysTeacherMapper.updateByPrimaryKeySelective(formdata);
         }
         return new DocBaseDTO(formdata.getTeacher_id(), null, null);

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/exception/BizExceptionCode.java

@@ -14,6 +14,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     USELESS_DATA(50001, "无效数据"),
     NONGRADE(500004, "年纪名称不存在"),
     NONCLAZZ(500005, "班级名称不存在"),
+    REPEAT_TEACHER_NUMBER(500006, "教师工号重复"),
     NONSTU(500006, "学生不存在");
 
     private int code;

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/mapper/SysTeacherMapper.java

@@ -33,7 +33,9 @@ public interface SysTeacherMapper {
 
     List<SysTeacher> selectByTeacher(@Param("condition") String condition, @Param("school_id") Long schoolId);
 
-    int count(String teacher_number, Long school_id);
+    int count(@Param("teacher_number") String teacher_number, @Param("school_id") Long school_id);
 
     Long selectRoleId();
+
+    SysTeacher selectNumberByKey(String teacher_number);
 }

applications/school/school-server/src/main/resources/application.yml

@@ -90,4 +90,7 @@ hystrix:
                         timeoutInMilliseconds: 4000
 smartschool:
   domain:
-    wechat: https://school-wechat.ubtob.com
+    wechat: https://school-wechat.ubtob.com
+logging:
+  level:
+    com.usoftchina.smartschool.school: debug