教师婚姻状态

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

@@ -63,6 +63,7 @@ public class StudentServiceImpl implements StudentService{
         }
         SysStudent student = sysStudentMapper.selectByPrimaryKey(id);
         List<SysParents> parents = sysStudentMapper.selectParent(id);
+
         StudentForm studentForm = new StudentForm();
         studentForm.setMain(student);
         studentForm.setItems(parents);

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

@@ -144,11 +144,11 @@ public class TeacherServiceImpl implements TeacherService{
                             throw new BizException(BizExceptionCode.ILLEGAL_Gender);
                         }
 
-                        if ("已婚".equals(json.get("teacher_marriage"))) {
+                        if ("未婚".equals(json.get("teacher_marriage"))) {
                             json.put("teacher_marriage", 0);
-                        }else if ("未婚".equals(json.get("teacher_marriage"))) {
+                        }else if ("已婚".equals(json.get("teacher_marriage"))) {
                             json.put("teacher_marriage", 1);
-                        }else if (!"已婚".equals(json.get("teacher_marriage")) && !"未婚".equals(json.get("teacher_marriage"))) {
+                        }else if (!"未婚".equals(json.get("teacher_marriage")) && !"已婚".equals(json.get("teacher_marriage"))) {
                             throw new BizException(BizExceptionCode.ILLEGAL_MARRIAGE);
                         }
                     }