update user api

src/main/java/com/qmth/exam/reserve/bean/user/UserReq.java

@@ -21,6 +21,10 @@ public class UserReq extends PagerReq implements IModel {
     @ApiModelProperty(value = "登录名称")
     private String loginName;
 
-    @ApiModelProperty(value = "启用/禁用")
+    @ApiModelProperty(value = "角色代码")
+    private String roleCode;
+
+    @ApiModelProperty(value = "启用、禁用")
     private Boolean enable;
+
 }

src/main/java/com/qmth/exam/reserve/bean/user/UserVO.java

@@ -1,7 +1,6 @@
 package com.qmth.exam.reserve.bean.user;
 
 import com.qmth.exam.reserve.bean.IModel;
-import com.qmth.exam.reserve.enums.Role;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -15,11 +14,14 @@ public class UserVO implements IModel {
     @ApiModelProperty("id")
     private Long id;
 
-    @ApiModelProperty("启用/禁用")
+    @ApiModelProperty("启用、禁用")
     private Boolean enable;
 
-    @ApiModelProperty("角色")
-    private Role role;
+    @ApiModelProperty(value = "角色代码")
+    private String roleCode;
+
+    @ApiModelProperty(value = "角色名称")
+    private String roleName;
 
     @ApiModelProperty("用户姓名")
     private String name;

src/main/java/com/qmth/exam/reserve/enums/Role.java

@@ -16,10 +16,10 @@ public enum Role {
         this.title = title;
     }
 
-    public static Role getByTitle(String title) {
-        for (Role r : Role.values()) {
-            if (r.getTitle().equals(title)) {
-                return r;
+    public static String getRoleName(String roleCode) {
+        for (Role role : Role.values()) {
+            if (role.name().equals(roleCode)) {
+                return role.getTitle();
             }
         }
 

src/main/java/com/qmth/exam/reserve/service/impl/AuthServiceImpl.java

@@ -77,6 +77,10 @@ public class AuthServiceImpl implements AuthorizationService<LoginUser>, AuthSer
             throw new StatusException("登录账号或密码错误");
         }
 
+        if (!user.getEnable()) {
+            throw new StatusException("登录账号已禁用");
+        }
+
         String encodePassword = DigestUtils.sha256Hex(req.getPassword()).toUpperCase();
         if (!encodePassword.equals(user.getPassword())) {
             throw new StatusException("登录账号或密码错误");

src/main/java/com/qmth/exam/reserve/service/impl/UserServiceImpl.java

@@ -31,18 +31,18 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
     @Override
     public UserEntity findUserByLoginName(Long orgId, String loginName) {
         LambdaQueryWrapper<UserEntity> wrapper = new LambdaQueryWrapper<>();
-        if (orgId != null) {
-            wrapper.eq(UserEntity::getOrgId, orgId);
-        }
+        wrapper.eq(UserEntity::getOrgId, orgId);
         wrapper.eq(UserEntity::getLoginName, loginName);
-        wrapper.eq(UserEntity::getEnable, true);
         return baseMapper.selectOne(wrapper);
     }
 
     @Override
     public PageResult<UserVO> pageUser(UserReq req) {
-        IPage<UserVO> iPage = baseMapper.pageUser(new Page<>(req.getPageNumber(), req.getPageSize()), req);
-        return PageUtil.of(iPage);
+        IPage<UserVO> page = baseMapper.pageUser(new Page<>(req.getPageNumber(), req.getPageSize()), req);
+        page.getRecords().forEach(user -> {
+            user.setRoleName(Role.getRoleName(user.getRoleCode()));
+        });
+        return PageUtil.of(page);
     }
 
     @Override
@@ -53,7 +53,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         userEntity.setOrgId(user.getOrgId());
         BeanUtils.copyProperties(req, userEntity);
 
-        if(req.getId() == null) {
+        if (req.getId() == null) {
             userEntity.setEnable(Boolean.TRUE);
             userEntity.setPassword(DigestUtils.sha256Hex("123456").toUpperCase());
             this.save(userEntity);

src/main/resources/mapper/UserMapper.xml

@@ -5,17 +5,16 @@
     <select id="pageUser" resultType="com.qmth.exam.reserve.bean.user.UserVO">
         SELECT
         u.id,
-        u.ENABLE,
-        u.role,
-        u.NAME,
+        u.enable,
+        u.role roleCode,
+        u.name,
         u.login_name loginName,
         u.mobile,
         u.category_id categoryId,
         u.create_time createTime,
         u.update_time updateTime,
-        g.NAME categoryName
-        FROM
-        t_user u
+        g.name categoryName
+        FROM t_user u
         LEFT JOIN t_category g ON g.id = u.category_id
         <where>
             <if test="req.categoryId != null">
@@ -27,6 +26,9 @@
             <if test="req.loginName != null and req.loginName !=''">
                 and u.login_name = #{req.loginName}
             </if>
+            <if test="req.roleCode != null and req.roleCode !=''">
+                and u.role = #{req.roleCode}
+            </if>
             <if test="req.enable != null">
                 and u.enable=#{req.enable}
             </if>