From da374bcccfd2a118d7bac4473fff6fef4850821e Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Wed, 30 Aug 2023 12:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/user/pojo/vo/UserVO.java        | 3 +++
 .../src/main/java/com/njcn/user/service/IRoleService.java  | 7 +++++++
 .../java/com/njcn/user/service/impl/RoleServiceImpl.java   | 5 +++++
 .../java/com/njcn/user/service/impl/UserServiceImpl.java   | 4 +++-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/UserVO.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/UserVO.java
index 2fe121809..b50e68f97 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/UserVO.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/UserVO.java
@@ -52,4 +52,7 @@ public class UserVO extends UserParam implements Serializable {
     @ApiModelProperty("头像")
     private String headSculpture;
 
+    @ApiModelProperty("角色编码")
+    private List<String> roleCode;
+
 }
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IRoleService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IRoleService.java
index 6c40c86ac..bfcdd3d51 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IRoleService.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IRoleService.java
@@ -39,6 +39,13 @@ public interface IRoleService extends IService<Role> {
      */
     List<String> getIdByUserId(String id);
 
+    /**
+     * 根据角色id获取角色code
+     * @param list
+     * @return 角色名集合
+     */
+    List<String> getCodeByList(List<String> list);
+
     /**
      * 分页查询角色列表
      * @param queryParam
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/RoleServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/RoleServiceImpl.java
index 9e1e71722..c7c33e8c5 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/RoleServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/RoleServiceImpl.java
@@ -98,6 +98,11 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
         return userRoleService.getUserRoleByUserId(id).stream().map(UserRole::getRoleId).distinct().collect(Collectors.toList());
     }
 
+    @Override
+    public List<String> getCodeByList(List<String> list) {
+        return this.lambdaQuery().in(Role::getId,list).list().stream().map(Role::getCode).distinct().collect(Collectors.toList());
+    }
+
     @Override
     public Page<RoleVO> listRole(RoleParam.QueryParam queryParam) {
         QueryWrapper<RoleVO> queryWrapper = new QueryWrapper<>();
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
index 486a0a7b9..b70e959b6 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
@@ -269,8 +269,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             userVO.setDeptName(deptService.getNameByDeptId(user.getDeptId()));
             userVO.setDeptLevel(dept.getPids().split(StrUtil.COMMA).length);
         }
-        userVO.setRoleList(roleService.getIdByUserId(id));
+        List<String> roleList = roleService.getIdByUserId(id);
+        userVO.setRoleList(roleList);
         userVO.setRole(roleService.getNameByUserId(id));
+        userVO.setRoleCode(roleService.getCodeByList(roleList));
         return userVO;
     }