在查询的 SQL 中排除掉 rootGroupId 和 rootUserId 字段

Author: colorful3

src/main/java/io/github/talelin/merak/controller/cms/AdminController.java

@@ -63,9 +63,7 @@ public PageResponseVO getUsers(
             List<GroupDO> groups = groupService.getUserGroupsByUserId(user.getId());
             return new UserInfoVO(user, groups);
         }).collect(Collectors.toList());
-        boolean existedRoot = userInfos.removeIf(userInfo -> groupService.checkIsRootByUserId(userInfo.getId()));
-        long total = existedRoot ? iPage.getTotal() - 1 : iPage.getTotal();
-        return ResponseUtil.generatePageResult(total, userInfos, page, count);
+        return ResponseUtil.generatePageResult(iPage.getTotal(), userInfos, page, count);
     }
 
     @PutMapping("/user/{id}/password")

src/main/java/io/github/talelin/merak/mapper/UserMapper.java

@@ -35,7 +35,8 @@ public interface UserMapper extends BaseMapper<UserDO> {
      *
      * @param pager   分页
      * @param groupId 分组id
+     * @param rootGroupId 超级用户组id(不返回超级用户组的用户)
      * @return 分页数据
      */
-    IPage<UserDO> selectPageByGroupId(Page pager, Long groupId);
+    IPage<UserDO> selectPageByGroupId(Page pager, Long groupId, Long rootGroupId);
 }

src/main/java/io/github/talelin/merak/service/GroupService.java

@@ -93,6 +93,4 @@ public interface GroupService extends IService<GroupDO> {
      * @return 用户id
      */
     List<Long> getGroupUserIds(Long id);
-
-    Long getRootGroupId();
 }

src/main/java/io/github/talelin/merak/service/impl/AdminServiceImpl.java

@@ -45,13 +45,18 @@ public class AdminServiceImpl implements AdminService {
     @Value("${group.guest.id}")
     private Long guestGroupId;
 
+    @Value("${user.root.id}")
+    private Long rootUserId;
+
     @Override
     public IPage<UserDO> getUserPageByGroupId(Long groupId, Long count, Long page) {
         Page pager = new Page(page, count);
         IPage<UserDO> iPage;
         // 如果group_id为空，则以分页的形式返回所有用户
         if (groupId == null) {
-            iPage = userService.page(pager);
+            QueryWrapper<UserDO> wrapper = new QueryWrapper<>();
+            wrapper.lambda().ne(UserDO::getId, rootUserId);
+            iPage = userService.page(pager, wrapper);
         } else {
             iPage = userService.getUserPageByGroupId(pager, groupId);
         }
@@ -166,8 +171,9 @@ public boolean removePermissions(RemovePermissionsDTO dto) {
 
     @Override
     public List<GroupDO> getAllGroups() {
-        List<GroupDO> groups = groupService.list();
-        groups.removeIf(group -> group.getId().equals(groupService.getRootGroupId()));
+        QueryWrapper<GroupDO> wrapper = new QueryWrapper<>();
+        wrapper.lambda().ne(GroupDO::getId, rootGroupId);
+        List<GroupDO> groups = groupService.list(wrapper);
         return groups;
     }
 

src/main/java/io/github/talelin/merak/service/impl/GroupServiceImpl.java

@@ -117,11 +117,6 @@ public List<Long> getGroupUserIds(Long id) {
         return list.stream().map(UserGroupDO::getUserId).collect(Collectors.toList());
     }
 
-    @Override
-    public Long getRootGroupId() {
-        return rootGroupId;
-    }
-
     private boolean checkGroupExistByIds(List<Long> ids) {
         return ids.stream().allMatch(this::checkGroupExistById);
     }

src/main/java/io/github/talelin/merak/service/impl/UserServiceImpl.java

@@ -186,7 +186,7 @@ public boolean checkUserExistById(Long id) {
 
     @Override
     public IPage<UserDO> getUserPageByGroupId(Page pager, Long groupId) {
-        return this.baseMapper.selectPageByGroupId(pager, groupId);
+        return this.baseMapper.selectPageByGroupId(pager, groupId, rootGroupId);
     }
 
     private void checkGroupsExist(List<Long> ids) {

src/main/resources/mapper/UserMapper.xml

@@ -32,6 +32,7 @@
         SELECT ug.user_id
         FROM lin_user_group AS ug
         WHERE ug.group_id = #{groupId}
+        AND ug.group_id != #{rootGroupId}
         )
         AND u.delete_time IS NULL
     </select>

src/test/java/io/github/talelin/merak/mapper/UserMapperTest.java

@@ -73,7 +73,7 @@ public void selectPageByGroupId() {
         userGroupMapper.insert(new UserGroupDO(userDO.getId(), group.getId()));
 
         Page page = new Page(0, 10);
-        IPage<UserDO> iPage = userMapper.selectPageByGroupId(page, group.getId());
+        IPage<UserDO> iPage = userMapper.selectPageByGroupId(page, group.getId(), 1L);
         assertTrue(iPage.getTotal() > 0);
         boolean anyMatch = iPage.getRecords().stream().anyMatch(it -> it.getUsername().equals(username));
         assertTrue(anyMatch);