Merge branch 'refs/heads/master' into feature-xiaolfeng

# Conflicts:
#	src/main/java/com/jsl/oa/controllers/AuthController.java
#	src/main/java/com/jsl/oa/utils/Processing.java

src/main/java/com/jsl/oa/controllers/AuthController.java

@@ -178,8 +178,7 @@ public class AuthController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
         }
-        return authService.
+        return authService.authChangePassword(userChangePasswordVO, request);
-                authChangePassword((UserChangePasswordVO) request, (HttpServletRequest) userChangePasswordVO);
     }
 
     /**

src/main/java/com/jsl/oa/model/vodata/UserAllCurrentVO.java

@@ -9,5 +9,5 @@ public class UserAllCurrentVO {
     private Long page;
     private Long limit;
     private String search;
-    private Long role;
+    private String role;
 }

src/main/java/com/jsl/oa/model/vodata/UserCurrentBackVO.java

@@ -25,16 +25,10 @@ public class UserCurrentBackVO {
     @Accessors(chain = true)
     public static class UserCurrent {
         private ReturnUser user;
-        private ReturnUserRole role;
+        private String role;
         private List<String> permission;
     }
 
-    @Data
-    @Accessors(chain = true)
-    public static class ReturnUserRole {
-        private Long rid;
-    }
-
     @Data
     @Accessors(chain = true)
     public static class ReturnUser {

src/main/java/com/jsl/oa/model/vodata/UserReturnBackVO.java

@@ -18,16 +18,10 @@ import java.util.List;
 @Accessors(chain = true)
 public class UserReturnBackVO {
     private ReturnUser user;
-    private ReturnUserRole role;
+    private String role;
     private String token;
     private List<String> permission;
 
-    @Data
-    @Accessors(chain = true)
-    public static class ReturnUserRole {
-        private Long rid;
-    }
-
     @Data
     @Accessors(chain = true)
     public static class ReturnUser {

src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java

@@ -6,6 +6,7 @@ import com.jsl.oa.dao.PermissionDAO;
 import com.jsl.oa.dao.RoleDAO;
 import com.jsl.oa.mapper.RoleMapper;
 import com.jsl.oa.mapper.UserMapper;
+import com.jsl.oa.model.dodata.RoleDO;
 import com.jsl.oa.model.dodata.RoleUserDO;
 import com.jsl.oa.model.dodata.UserDO;
 import com.jsl.oa.model.vodata.*;
@@ -283,14 +284,21 @@ public class AuthServiceImpl implements AuthService {
         } else {
             getUserRole.setUid(null);
         }
+        // 获取角色信息
+        RoleDO getRole = roleDAO.getRoleById(getUserRole.getRid());
+        String getRoleString;
+        if (getRole != null) {
+            getRoleString = getRole.getRoleName();
+        } else {
+            getRoleString = "default";
+        }
         userReturnBackVO.setUser(new UserReturnBackVO.ReturnUser()
                         .setId(userDO.getId())
                         .setJobId(userDO.getJobId())
                         .setUsername(userDO.getUsername())
                         .setEmail(userDO.getEmail())
                         .setPhone(userDO.getPhone()))
-                .setRole(new UserReturnBackVO.ReturnUserRole()
+                .setRole(getRoleString)
-                        .setRid(getUserRole.getRid()))
                 .setToken(token)
                 .setPermission(getPermissionForString);
         return ResultUtil.success("登陆成功", userReturnBackVO);

src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java

@@ -126,7 +126,7 @@ public class UserServiceImpl implements UserService {
         }
         // 检查是否存在 Role 筛选
         if (userAllCurrentVO.getRole() != null) {
-            userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole().getRid()));
+            userCurrentBackVO.getUsers().removeIf(it -> !userAllCurrentVO.getRole().equals(it.getRole()));
         }
         return ResultUtil.success(userCurrentBackVO);
     }
@@ -271,7 +271,7 @@ public class UserServiceImpl implements UserService {
         UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request));
         UserProfileVo userProfileVo = new UserProfileVo();
         Processing.copyProperties(userDO, userProfileVo);
-        userProfileVo.setRole(roleDAO.getRoleNameByUid(userDO.getId()).getDisplayName());
+        userProfileVo.setRole(roleDAO.getRoleNameByUid(userDO.getId()).getRoleName());
         userProfileVo.setSex(Processing.getSex(userDO.getSex()));
         return ResultUtil.success(userProfileVo);
     }

src/main/java/com/jsl/oa/utils/Processing.java

@@ -298,30 +298,37 @@ public class Processing {
             // 获取权限列表信息
             getPermissionForString = permissionDAO.getPermission(userDO.getId());
         }
-        userCurrent.setUser(new UserCurrentBackVO.ReturnUser().
+        RoleDO getRole = roleDAO.getRoleById(getUserRole.getRid());
-                setId(userDO.getId()).
+        String getRoleString;
-                setJobId(userDO.getJobId()).
+        if (getRole != null) {
-                setUsername(userDO.getUsername()).
+            getRoleString = getRole.getRoleName();
-                setAddress(userDO.getAddress()).
+        } else {
-                setPhone(userDO.getPhone()).
+            getRoleString = "default";
-                setEmail(userDO.getEmail()).
+        }
-                setAge(userDO.getAge()).
+        userCurrent
-                setSignature(userDO.getSignature()).
+                .setUser(new UserCurrentBackVO.ReturnUser()
-                setAvatar(userDO.getAvatar()).
+                        .setId(userDO.getId())
-                setNickname(userDO.getNickname()).
+                        .setJobId(userDO.getJobId())
-                setSex(userDO.getSex()).
+                        .setUsername(userDO.getUsername())
-                setEnabled(userDO.getEnabled()).
+                        .setAddress(userDO.getAddress())
-                setAccountNoExpired(userDO.getAccountNoExpired()).
+                        .setPhone(userDO.getPhone())
-                setCredentialsNoExpired(userDO.getCredentialsNoExpired()).
+                        .setEmail(userDO.getEmail())
-                setRecommend(userDO.getRecommend()).
+                        .setAge(userDO.getAge())
-                setAccountNoLocked(userDO.getAccountNoLocked()).
+                        .setSignature(userDO.getSignature())
-                setDescription(userDO.getDescription()).
+                        .setAvatar(userDO.getAvatar())
-                setCreatedAt(userDO.getCreatedAt()).
+                        .setNickname(userDO.getNickname())
-                setUpdatedAt(userDO.getUpdatedAt()).
+                        .setSex(userDO.getSex())
-                setIsDelete(userDO.getIsDelete())).
+                        .setEnabled(userDO.getEnabled())
-                setRole(new UserCurrentBackVO.ReturnUserRole().
+                        .setAccountNoExpired(userDO.getAccountNoExpired())
-                        setRid(getUserRole.getRid())).
+                        .setCredentialsNoExpired(userDO.getCredentialsNoExpired())
-                setPermission(getPermissionForString);
+                        .setRecommend(userDO.getRecommend())
+                        .setAccountNoLocked(userDO.getAccountNoLocked())
+                        .setDescription(userDO.getDescription())
+                        .setCreatedAt(userDO.getCreatedAt())
+                        .setUpdatedAt(userDO.getUpdatedAt())
+                        .setIsDelete(userDO.getIsDelete()))
+                .setRole(getRoleString)
+                .setPermission(getPermissionForString);
         return userCurrent;
     }