Skip to content

Commit 3cf31b6

Browse files
committed
Fix total count in group list endpoint
1 parent 29689c8 commit 3cf31b6

File tree

1 file changed

+2
-2
lines changed
  • server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement

1 file changed

+2
-2
lines changed

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
9999
.filter(orgMember -> !orgMember.isAdmin() && !orgMember.isSuperAdmin() &&
100100
devMembers.stream().noneMatch(devMember -> devMember.getUserId().equals(orgMember.getUserId()))).toList().size();
101101

102-
var subList = groupList.subList((pageNum - 1) * pageSize, pageSize <= 0?groupList.size():pageNum * pageSize);
102+
var subList = groupList.subList((pageNum - 1) * pageSize, pageSize <= 0?groupList.size():Math.min(pageNum * pageSize, groupList.size()));
103103
return new GroupListResponseView<>(ResponseView.SUCCESS,
104104
"",
105105
subList,
106106
totalAdmins,
107107
totalAdminsAndDevelopers,
108108
totalDevelopersOnly,
109109
totalOtherMembers,
110-
subList.size(),
110+
groupList.size(),
111111
pageNum,
112112
pageSize);
113113
})

0 commit comments

Comments
 (0)