From a1d173de9c9eb7fb89c7585f1754fbdca5441d47 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Fri, 25 Apr 2025 14:48:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E8=B6=85=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/system/SysUserApplyController.java | 4 +++- .../web/controller/system/system/SysUserController.java | 7 +++++-- .../system/system/SysUserExamineController.java | 8 ++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java index 2103573..5ba5320 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserApplyController.java @@ -74,7 +74,9 @@ public class SysUserApplyController extends BaseController { startPage(); user.setExamine("0"); List list = userService.selectUserList(user); - return getDataTable(list); + List userList = list.stream() + .filter(u -> !"admin".equals(u.getLoginName())).collect(Collectors.toList()); + return getDataTable(userList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java index b3313bf..dfc1b7a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserController.java @@ -352,8 +352,11 @@ public class SysUserController extends BaseController { @PostMapping("/userList") @ResponseBody public AjaxResult userList() { - return AjaxResult.success(userService.lambdaQuery(). - select(SysUser::getUserId,SysUser::getUserName).list()); + List list = userService.lambdaQuery(). + select(SysUser::getUserId, SysUser::getUserName).list(); + List userList = list.stream() + .filter(u -> !"admin".equals(u.getUserName())).collect(Collectors.toList()); + return AjaxResult.success(userList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java index ac64474..04efc98 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysUserExamineController.java @@ -55,7 +55,9 @@ public class SysUserExamineController extends BaseController { startPage(); user.setExamine("2"); List list = userService.selectUserList(user); - return getDataTable(list); + List userList = list.stream() + .filter(u -> !"admin".equals(u.getLoginName())).collect(Collectors.toList()); + return getDataTable(userList); } /** @@ -70,7 +72,9 @@ public class SysUserExamineController extends BaseController { startPage(); user.setExamine("0"); List list = userService.selectUserList(user); - return getDataTable(list); + List userList = list.stream() + .filter(u -> !"admin".equals(u.getLoginName())).collect(Collectors.toList()); + return getDataTable(userList); } /**