Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

用户列表查询调整

Browse Source
This commit is contained in:
xy
2024-09-20 15:49:04 +08:00
parent 88b44a821d
commit f5b7852c6a
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
View File

@@ -284,14 +284,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
Page<UserVO> page = new Page<>(); Page<UserVO> page = new Page<>();
User user = this.lambdaQuery().eq(User::getId, RequestUtil.getUserIndex()).one(); User user = this.lambdaQuery().eq(User::getId, RequestUtil.getUserIndex()).one();
Integer type = user.getType(); Integer type = user.getType();
List<Integer> types = new ArrayList<>();
List<String> roleCodeList = roleService.getRoleNameByUserId(user.getId());
//超级管理员，展示所有用户信息（不包含root）
if (Objects.equals(UserType.SUPER_ADMINISTRATOR, type)) { if (Objects.equals(UserType.SUPER_ADMINISTRATOR, type)) {
type = UserType.ADMINISTRATOR; types.addAll(Arrays.asList(UserType.ADMINISTRATOR, UserType.USER, UserType.APP));
//fixme 存在web用户和App用户，目前先通过管理员的登录名来区分开
} else if (Objects.equals(UserType.ADMINISTRATOR, type) && !Objects.equals(user.getLoginName(), "njcnyw")) {
type = UserType.USER;
} }
else if (Objects.equals(UserType.USER, type) || Objects.equals(UserType.APP, type)) { //业务管理员，展示管理员和web用户
return page; else if (Objects.equals(UserType.ADMINISTRATOR, type) && !roleCodeList.contains("operation_manager")) {
types.addAll(Arrays.asList(UserType.ADMINISTRATOR, UserType.USER));
}
//运维管理员，展示管理员和App用户
else if (Objects.equals(UserType.ADMINISTRATOR, type) && roleCodeList.contains("operation_manager")) {
types.addAll(Arrays.asList(UserType.ADMINISTRATOR, UserType.APP));
} }
if (ObjectUtil.isNotNull(queryParam)) { if (ObjectUtil.isNotNull(queryParam)) {
//查询参数不为空，进行条件填充 //查询参数不为空，进行条件填充
@@ -309,7 +314,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
queryWrapper.orderBy(true, false, "sys_user.login_time"); queryWrapper.orderBy(true, false, "sys_user.login_time");
} }
} }
queryWrapper.eq("sys_user.type", type); queryWrapper.in("sys_user.type", types);
page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper, queryParam.getSearchState(), queryParam.getCasualUser()); page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper, queryParam.getSearchState(), queryParam.getCasualUser());
page.getRecords().forEach(item -> { page.getRecords().forEach(item -> {
item.setRoleList(roleService.getIdByUserId(item.getId())); item.setRoleList(roleService.getIdByUserId(item.getId()));