From f5b7852c6af9b9ab9874d5effba5d2125abc66b3 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Fri, 20 Sep 2024 15:49:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/impl/UserServiceImpl.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) 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 52064f124..7702fd442 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 @@ -284,14 +284,19 @@ public class UserServiceImpl extends ServiceImpl implements IU Page page = new Page<>(); User user = this.lambdaQuery().eq(User::getId, RequestUtil.getUserIndex()).one(); Integer type = user.getType(); + List types = new ArrayList<>(); + List roleCodeList = roleService.getRoleNameByUserId(user.getId()); + //超级管理员，展示所有用户信息（不包含root） if (Objects.equals(UserType.SUPER_ADMINISTRATOR, type)) { - type = UserType.ADMINISTRATOR; - //fixme 存在web用户和App用户，目前先通过管理员的登录名来区分开 - } else if (Objects.equals(UserType.ADMINISTRATOR, type) && !Objects.equals(user.getLoginName(), "njcnyw")) { - type = UserType.USER; + types.addAll(Arrays.asList(UserType.ADMINISTRATOR, UserType.USER, UserType.APP)); } - else if (Objects.equals(UserType.USER, type) || Objects.equals(UserType.APP, type)) { - return page; + //业务管理员，展示管理员和web用户 + 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)) { //查询参数不为空，进行条件填充 @@ -309,7 +314,7 @@ public class UserServiceImpl extends ServiceImpl implements IU 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.getRecords().forEach(item -> { item.setRoleList(roleService.getIdByUserId(item.getId()));