From 5335217fc9d7961bad13529583533c1299708d5b Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Tue, 29 Aug 2023 14:22:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/user/service/impl/UserServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 48ef61e17..486a0a7b9 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 @@ -278,12 +278,17 @@ public class UserServiceImpl extends ServiceImpl implements IU public Page userList(UserParam.UserQueryParam queryParam) { QueryWrapper queryWrapper = new QueryWrapper<>(); Page page = new Page<>(); - Integer type = this.lambdaQuery().eq(User::getId, RequestUtil.getUserIndex()).one().getType(); + User user = this.lambdaQuery().eq(User::getId, RequestUtil.getUserIndex()).one(); + Integer type = user.getType(); if (Objects.equals(UserType.SUPER_ADMINISTRATOR, type)) { type = UserType.ADMINISTRATOR; - } else if (Objects.equals(UserType.ADMINISTRATOR, type)) { + //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)) { + } else if (Objects.equals(UserType.ADMINISTRATOR, type) && Objects.equals(user.getLoginName(),"njcnyw")) { + type = UserType.APP; + } + else if (Objects.equals(UserType.USER, type) || Objects.equals(UserType.APP, type)) { return page; } if (ObjectUtil.isNotNull(queryParam)) {