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 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 { */ List getIdByUserId(String id); + /** + * 根据角色id获取角色code + * @param list + * @return 角色名集合 + */ + List getCodeByList(List 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 implements IR return userRoleService.getUserRoleByUserId(id).stream().map(UserRole::getRoleId).distinct().collect(Collectors.toList()); } + @Override + public List getCodeByList(List list) { + return this.lambdaQuery().in(Role::getId,list).list().stream().map(Role::getCode).distinct().collect(Collectors.toList()); + } + @Override public Page listRole(RoleParam.QueryParam queryParam) { QueryWrapper 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 implements IU userVO.setDeptName(deptService.getNameByDeptId(user.getDeptId())); userVO.setDeptLevel(dept.getPids().split(StrUtil.COMMA).length); } - userVO.setRoleList(roleService.getIdByUserId(id)); + List roleList = roleService.getIdByUserId(id); + userVO.setRoleList(roleList); userVO.setRole(roleService.getNameByUserId(id)); + userVO.setRoleCode(roleService.getCodeByList(roleList)); return userVO; }