1.修改查询用户列表方法，修复分页查询失效问题

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<AuthAdmin> authAdmins = authAdminService.listAdminPage(authAdminQueryRequest);
-        List<AuthAdmin> authAdminList = new ArrayList<>();
-        for (AuthAdmin authAdmin : authAdmins) {
-            if (!authAdmin.getUserName().equals("admin")) {
-                authAdminList.add(authAdmin);
-            }
-        }
         // 查询所有的权限
-        List<Long> adminIds = authAdminList.stream().map(AuthAdmin::getId).collect(Collectors.toList());
+        List<Long> adminIds = authAdmins.stream().map(AuthAdmin::getId).collect(Collectors.toList());
         List<AuthRoleAdmin> authRoleAdminList = authRoleAdminService.listByAdminIdIn(adminIds);
 
         // 视图列表
-        List<AuthAdminResponse> authAdminResponseList = authAdminList.stream().map(item -> {
+        List<AuthAdminResponse> authAdminResponseList = authAdmins.stream().map(item -> {
             AuthAdminResponse authAdminResponse = new AuthAdminResponse();
             BeanUtils.copyProperties(item, authAdminResponse);
             List<Long> roles = authRoleAdminList.stream()
@@ -87,13 +82,11 @@ public class AuthAdminController {
             return authAdminResponse;
         }).collect(Collectors.toList());
 
-        PageInfo<AuthAdmin> authAdminPageInfo = new PageInfo<>(authAdminList);
+        PageInfo<AuthAdmin> authAdminPageInfo = new PageInfo<>(authAdmins);
         PageSimpleResponse<AuthAdminResponse> authAdminPageSimpleResponse = new PageSimpleResponse<>();
         authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal());
         authAdminPageSimpleResponse.setList(authAdminResponseList);
-
         return ResultVOUtils.success(authAdminPageSimpleResponse);
-
     }
 
 

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

api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -20,6 +20,9 @@
             <if test="userName != null and '' != userName">
                 AND userName LIKE CONCAT(#{userName},'%')
             </if>
+            <if test="neUserName != null and '' != neUserName">
+                AND userName != #{neUserName}
+            </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
                 <![CDATA[   and DATE_FORMAT(lastModifyTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>