From 36ad7c0bfac1054e3da239b0e5d2adf65a192484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 14 Jun 2026 10:42:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=B7=BB=E5=8A=A0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=89=80=E6=9C=89=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 UserSearchQO 中新增 showAll 字段，默认值为 true - 修改 UserControllerService 中的权限判断逻辑，增加对 showAll 参数的支持 - 非超级管理员用户可通过设置 showAll 控制是否显示所有用户数据 --- .../com/nflg/wms/admin/service/UserControllerService.java | 2 +- .../main/java/com/nflg/wms/common/pojo/qo/UserSearchQO.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java index 0c80d0cb..bb79bde2 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java @@ -186,7 +186,7 @@ public class UserControllerService { if (Objects.nonNull(request.getDeptId())) { request.setDeptIds(deptService.getWithChildren(request.getDeptId())); } - if (!UserUtil.getRoles().contains(Constant.SUPER_ADMIN)) { + if (!request.getShowAll() || !UserUtil.getRoles().contains(Constant.SUPER_ADMIN)) { request.setCreateById(UserUtil.getUserId()); } IPage pu = uService.search(request); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/UserSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/UserSearchQO.java index 24ddb8a9..2e98f29e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/UserSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/UserSearchQO.java @@ -31,4 +31,9 @@ public class UserSearchQO extends SearchBaseQO { @JsonIgnore private Long createById; + + /** + * 是否显示所有用户 + */ + private Boolean showAll = true; }