Fix total count in group list endpoint

dragonpoo · dragonpoo · commit 3cf31b624991 · 2024-11-27T02:07:12.000-05:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java
@@ -99,15 +99,15 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
                             .filter(orgMember -> !orgMember.isAdmin() && !orgMember.isSuperAdmin() &&
                                 devMembers.stream().noneMatch(devMember -> devMember.getUserId().equals(orgMember.getUserId()))).toList().size();
 
-                        var subList = groupList.subList((pageNum - 1) * pageSize, pageSize <= 0?groupList.size():pageNum * pageSize);
+                        var subList = groupList.subList((pageNum - 1) * pageSize, pageSize <= 0?groupList.size():Math.min(pageNum * pageSize, groupList.size()));
                         return new GroupListResponseView<>(ResponseView.SUCCESS,
                             "",
                             subList,
                             totalAdmins,
                             totalAdminsAndDevelopers,
                             totalDevelopersOnly,
                             totalOtherMembers,
-                            subList.size(),
+                            groupList.size(),
                             pageNum,
                             pageSize);
                     })
