From 35a6e9cedc2f44bebc9e4ec81a429eddc8b631ea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 22 Sep 2021 11:41:42 +0800
Subject: [PATCH] 用户查询接口修改，部门名称需拼接父部门名称
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 2588620..c1fa1d7 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -180,9 +180,36 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+ public IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
+ List<UserVO> users = baseMapper.selectUserPage(page, user, deptIdList, tenantId);
+ //遍历获取部门名称，角色名称
+ users.forEach(userVO -> {
+ //查询当前部门名称及父级部门名称
+ List<String> list = baseMapper.getDeptName(userVO.getDeptId());
+ if (list.size()>1){
+ if (null!=list.get(1) && list.get(1)!=""){
+ userVO.setDeptName(list.get(1)+","+list.get(0));
+ }else {
+ userVO.setDeptName(list.get(0));
+ }
+ }
+ if (list.size()==1){
+ userVO.setDeptName(list.get(0));
+ }
+ //查询角色名称
+ List<String> asList = Arrays.asList(userVO.getRoleId().split(","));
+ StringBuilder builder = new StringBuilder();
+ asList.forEach(roleIs ->{
+ Role role = roleService.getById(roleIs);
+ if (null!=role){
+ builder.append(role.getRoleName()+",");
+ }
+ });
+ String substringRoleName = builder.toString().substring(0, builder.toString().length() - 1);
+ userVO.setRoleName(substringRoleName);
+ });
+ return page.setRecords(users);
}
@Override
--
Gitblit v1.9.3