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<UserVO> 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;
 }