Browse Source

教职工信息勾选不能直接删

zhaoy 6 years ago
parent
commit
d1982a688f

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

@@ -138,6 +138,12 @@ public class TeacherServiceImpl implements TeacherService{
                         }else if ("女".equals(json.get("teacher_sex"))) {
                             json.put("teacher_sex", 2);
                         };
+
+                        if ("已婚".equals(json.get("teacher_marriage"))) {
+                            json.put("teacher_marriage", 0);
+                        }else if ("否".equals(json.get("teacher_marriage"))) {
+                            json.put("teacher_marriage", 1);
+                        };
                     }
                     teacher = JSONObject.parseObject(json.toJSONString(), SysTeacher.class);
                     teacher.setSchool_id(schoolId);
@@ -186,8 +192,9 @@ public class TeacherServiceImpl implements TeacherService{
                 delete(base.getId());
             }catch (Exception e){
                 sb.append(sysTeacherMapper.selectByPrimaryKey(base.getId()).getTeacher_name() + "|");
+                throw new BizException(BizExceptionCode.TEACHERS_EXISTS_CLASS.getCode(), String.format(BizExceptionCode.TEACHERS_EXISTS_CLASS.getMessage(), sb.substring(0, sb.length() - 1)));
             }
         }
-        throw new BizException(BizExceptionCode.TEACHERS_EXISTS_CLASS.getCode(), String.format(BizExceptionCode.TEACHERS_EXISTS_CLASS.getMessage(), sb.substring(0, sb.length() - 1)));
+
     }
 }