Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -422,12 +422,10 @@ public class StudentManageServiceImpl implements StudentManageService {
         Student student = new Student(userId, studentRegistrationDao.getSubjectIds(userId));
         student.setOperatingTag(sysUser.getOperatingTag());
     	student.setOperatingTempTag(0);
-//        student.setServiceTag(sysUser.getServiceTag()==0?2:1);
-        student.setServiceTag(sysUser.getServiceTag());
+        student.setServiceTag(sysUser.getServiceTag()==0?2:1);
         student.setTeacherId(sysUser.getTeacherId());
         studentService.upSet(student);
-//        if(new Integer(2).equals(student.getServiceTag())){
-        if(new Integer(0).equals(student.getServiceTag())){
+        if(new Integer(2).equals(student.getServiceTag())){
             studentExtracurricularExercisesSituationDao.deleteByStudent(sysUser.getId());
         }
         return userId;

mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -115,7 +115,7 @@
         SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,
         su.birthdate_,su.nation_,su.organ_id_,
         CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
-        st.service_tag_,st.operating_tag_,tu.real_name_ teacher_name_,st.teacher_id_
+        IF(st.service_tag_=2,0,st.service_tag_) service_tag_,st.operating_tag_,tu.real_name_ teacher_name_,st.teacher_id_
         FROM sys_user su
         LEFT JOIN student st ON st.user_id_ = su.id_
         left join sys_user tu on tu.id_ = st.teacher_id_