From 29a65399848a4db912588c08883dec9a025eb620 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 27 Jul 2022 17:59:51 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthAdminController.java | 15 ++++----------- .../api/admin/req/auth/AuthAdminQueryRequest.java | 3 +++ .../mybatis/mapper/auth/AuthAdminDao.xml | 3 +++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java index 421b1598..f0be7879 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java @@ -64,19 +64,14 @@ public class AuthAdminController { } authAdminQueryRequest.setIds(ids); } + authAdminQueryRequest.setNeUserName("admin"); List authAdmins = authAdminService.listAdminPage(authAdminQueryRequest); - List authAdminList = new ArrayList<>(); - for (AuthAdmin authAdmin : authAdmins) { - if (!authAdmin.getUserName().equals("admin")) { - authAdminList.add(authAdmin); - } - } // 查询所有的权限 - List adminIds = authAdminList.stream().map(AuthAdmin::getId).collect(Collectors.toList()); + List adminIds = authAdmins.stream().map(AuthAdmin::getId).collect(Collectors.toList()); List authRoleAdminList = authRoleAdminService.listByAdminIdIn(adminIds); // 视图列表 - List authAdminResponseList = authAdminList.stream().map(item -> { + List authAdminResponseList = authAdmins.stream().map(item -> { AuthAdminResponse authAdminResponse = new AuthAdminResponse(); BeanUtils.copyProperties(item, authAdminResponse); List roles = authRoleAdminList.stream() @@ -87,13 +82,11 @@ public class AuthAdminController { return authAdminResponse; }).collect(Collectors.toList()); - PageInfo authAdminPageInfo = new PageInfo<>(authAdminList); + PageInfo authAdminPageInfo = new PageInfo<>(authAdmins); PageSimpleResponse authAdminPageSimpleResponse = new PageSimpleResponse<>(); authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal()); authAdminPageSimpleResponse.setList(authAdminResponseList); - return ResultVOUtils.success(authAdminPageSimpleResponse); - } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java index d71e0553..9df0874b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java @@ -20,4 +20,7 @@ public class AuthAdminQueryRequest extends ListPageRequest { private String lastUpdateTime; + //用户名 != + private String neUserName; + } diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index e995405a..68a0eb48 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -20,6 +20,9 @@ AND userName LIKE CONCAT(#{userName},'%') + + AND userName != #{neUserName} + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>