修改sysuser lockFlag 类型为int，

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -60,7 +60,7 @@ public class SysUser implements Serializable{
 
 	/** 0-正常，9-锁定 */
 	@ApiModelProperty(value = "0-正常，9-锁定",required = false)
-	private UserLockFlag lockFlag;
+	private Integer lockFlag;
 
 	/** 0-正常，1-删除 */
 	@ApiModelProperty(value = "0-正常，1-删除",required = false)
@@ -223,14 +223,22 @@ public class SysUser implements Serializable{
 		return this.updateTime;
 	}
 
-	public UserLockFlag getLockFlag() {
+	public Integer getLockFlag() {
 		return lockFlag;
 	}
 
-	public void setLockFlag(UserLockFlag lockFlag) {
+	public void setLockFlag(Integer lockFlag) {
 		this.lockFlag = lockFlag;
 	}
 
+	public Boolean getSuperAdmin() {
+		return isSuperAdmin;
+	}
+
+	public void setSuperAdmin(Boolean superAdmin) {
+		isSuperAdmin = superAdmin;
+	}
+
 	public YesOrNoEnum getDelFlag() {
 		return delFlag;
 	}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/enums/UserLockFlag.java

@@ -9,11 +9,11 @@ import com.ym.mec.common.enums.BaseEnum;
  */
 public enum UserLockFlag implements BaseEnum<Integer, UserLockFlag> {
 
-	NORMAL(0, "正常"), CANCELLED(1, "冻结"), LOCKED(9, "锁定");
+	NORMAL(0, "正常"), LOCKED(9, "锁定"), CANCELLED(1, "冻结");
 
 	private int code;
 
-	private UserLockFlag(int code, String remark) {
+	UserLockFlag(int code, String remark) {
 		this.code = code;
 		this.remark = remark;
 	}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/AuthenticationFailureListener.java

@@ -61,7 +61,7 @@ public class AuthenticationFailureListener implements ApplicationListener<Authen
                 if(userLogin.getFailCount() >= 5){
                     userLogin.setLockTime(30);
                     userLogin.setLockDate(date);
-                    sysUser.setLockFlag(UserLockFlag.LOCKED);
+                    sysUser.setLockFlag(9);
                     sysUser.setUpdateTime(date);
                     sysUserService.update(sysUser);
                 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/service/DefaultUserDetailsService.java

@@ -51,7 +51,7 @@ public class DefaultUserDetailsService implements UserDetailsService {
 		}
 		if (userInfo == null) {
 			throw new UsernameNotFoundException("账户不存在");
-		} else if (userInfo.getSysUser().getLockFlag() == UserLockFlag.LOCKED) {
+		} else if (userInfo.getSysUser().getLockFlag() == 9) {
 			throw new LockedException("账户被锁定");
 		}
 
@@ -68,7 +68,7 @@ public class DefaultUserDetailsService implements UserDetailsService {
 
 		SysUser sysUser = userInfo.getSysUser();
 
-		return new AuthUser(sysUser.getId(), sysUser.getOrganId(), username, BCRYPT + sysUser.getPassword(), sysUser.getLockFlag() == UserLockFlag.NORMAL,
+		return new AuthUser(sysUser.getId(), sysUser.getOrganId(), username, BCRYPT + sysUser.getPassword(), sysUser.getLockFlag() == 0,
 				true, true, true, authorities);
 	}
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserLoginServiceImpl.java

@@ -60,7 +60,7 @@ public class SysUserLoginServiceImpl extends BaseServiceImpl<Integer, SysUserLog
 						userLogin.setLockTime(0);
 						update(userLogin);
 
-						user.setLockFlag(UserLockFlag.NORMAL);
+						user.setLockFlag(0);
 						user.setUpdateTime(currentDate);
 						sysUserDao.update(user);
 					}

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -59,7 +59,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 
 	@Override
 	public SysUser queryByPhone(String phone) {
-		return sysUserDao.queryByPhone(phone);
+		SysUser sysUser = sysUserDao.queryByPhone(phone);
+		return sysUser;
 	}
 
 	@Override

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -17,7 +17,7 @@
         <result column="organ_id_" property="organId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="lock_flag_" property="lockFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="lock_flag_" property="lockFlag"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="wx_openid_" property="wxOpenid"/>
         <result column="qq_openid_" property="qqOpenid"/>
@@ -108,7 +108,7 @@
                 update_time_ = NOW(),
             </if>
             <if test="lockFlag != null">
-                lock_flag_ = #{lockFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                lock_flag_ = #{lockFlag},
             </if>
             <if test="birthdate != null">
                 birthdate_ = #{birthdate},
@@ -186,7 +186,7 @@
     </select>
     
     <select id="queryByStatus" resultMap="SysUser">
-        select * from sys_user where lock_flag_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+        select * from sys_user where lock_flag_ = #{status}
     </select>
     <select id="getOrganName" resultType="java.lang.String">
         SELECT GROUP_CONCAT(name_) FROM organization WHERE FIND_IN_SET(id_,#{organId})

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

@@ -262,7 +262,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             sysUser.setPhone(studentRegistration.getParentsPhone());
             sysUser.setCreateTime(date);
             sysUser.setUpdateTime(date);
-            sysUser.setLockFlag(UserLockFlag.NORMAL);
+            sysUser.setLockFlag(0);
             sysUser.setDelFlag(com.ym.mec.auth.api.enums.YesOrNoEnum.NO);
             sysUser.setUserType(SysUserType.STUDENT);
             sysUser.setGender(studentRegistration.getGender());

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

@@ -33,7 +33,7 @@
         <result column="organ_id_" property="organId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="lock_flag_" property="lockFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="lock_flag_" property="lockFlag"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="wx_openid_" property="wxOpenid"/>
         <result column="qq_openid_" property="qqOpenid"/>

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

@@ -57,7 +57,7 @@
         UPDATE sys_user
         <set>
             <if test="delFlag != null">
-                del_flag_ = #{delFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                del_flag_ = #{delFlag},
             </if>
             <if test="wxOpenid != null">
                 wx_openid_ = #{wxOpenid},
@@ -84,7 +84,7 @@
                 update_time_ = NOW(),
             </if>
             <if test="lockFlag != null">
-                lock_flag_ = #{lockFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                lock_flag_ = #{lockFlag},
             </if>
             <if test="birthdate != null">
                 birthdate_ = #{birthdate},
@@ -489,7 +489,7 @@
         LEFT JOIN vip_group vg ON cg.music_group_id_ = vg.id_
         LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cg.id_
         LEFT JOIN vip_group_activity vgc ON vgc.id_ = vg.vip_group_activity_id_
-        WHERE cg.group_type_ = 'VIP' AND cgtm.teacher_role_ = 'BISHOP' AND cgsm.status != 'QUIT' AND cgsm.user_id_ = #{studentId}
+        WHERE cg.group_type_ = 'VIP' AND cgtm.teacher_role_ = 'BISHOP' AND cgsm.status_ != 'QUIT' AND cgsm.user_id_ = #{studentId}
         <if test="vipGroupName != null">
             AND vg.name_ LIKE CONCAT('%',#{vipGroupName},'%')
         </if>
@@ -504,7 +504,7 @@
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
         LEFT JOIN vip_group vg ON cg.music_group_id_ = vg.id_
         LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cg.id_
-        WHERE cg.group_type_ = 'VIP' AND cgtm.teacher_role_ = 'BISHOP' AND cgsm.status != 'QUIT' AND cgsm.user_id_ = #{studentId}
+        WHERE cg.group_type_ = 'VIP' AND cgtm.teacher_role_ = 'BISHOP' AND cgsm.status_ != 'QUIT' AND cgsm.user_id_ = #{studentId}
         <if test="vipGroupName != null">
             AND vg.name_ LIKE CONCAT('%',#{vipGroupName},'%')
         </if>

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

@@ -46,7 +46,7 @@
         <result column="organ_id_" property="organId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="lock_flag_" property="lockFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="lock_flag_" property="lockFlag"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="wx_openid_" property="wxOpenid"/>
         <result column="qq_openid_" property="qqOpenid"/>
@@ -363,7 +363,7 @@
         <result column="organ_id_" property="organId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <result column="lock_flag_" property="lockFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="lock_flag_" property="lockFlag"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="wx_openid_" property="wxOpenid"/>
         <result column="qq_openid_" property="qqOpenid"/>

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

@@ -36,7 +36,7 @@
         <result column="salt_" property="salt"/>
         <result column="phone_" property="phone"/>
         <result column="avatar_" property="avatar"/>
-        <result column="lock_flag_" property="lockFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="lock_flag_" property="lockFlag"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="wx_openid_" property="wxOpenid"/>
         <result column="qq_openid_" property="qqOpenid"/>
@@ -183,7 +183,7 @@
                 update_time_ = NOW(),
             </if>
             <if test="lockFlag != null">
-                lock_flag_ = #{lockFlag, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                lock_flag_ = #{lockFlag},
             </if>
             <if test="birthdate != null">
                 birthdate_ = #{birthdate},

mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.biz.dal.page.*;