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') ]]>