diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java index 65c6a8945..fdf6127e6 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java @@ -53,7 +53,7 @@ public Flux getOrganizationMembers(String orgId) { @Override public Flux getOrganizationMembers(String orgId, int page, int count) { - return biRelationService.getBySourceId(ORG_MEMBER, orgId, PageRequest.of(page, count)) + return biRelationService.getBySourceId(ORG_MEMBER, orgId, PageRequest.of(page - 1, count)) .map(OrgMember::from); } diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java index 07e97fc9d..1ae81589a 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java @@ -98,7 +98,7 @@ public Mono getGroupMembers(String groupId, int page, .filter(Objects::nonNull) .toList(); var pageTotal = list.size(); - list = list.subList(page * count, Math.min(page * count + count, pageTotal)); + list = list.subList((page - 1) * count, count == 0 ? pageTotal : Math.min(page * count, pageTotal)); return Pair.of(list, pageTotal); }); }) 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 index a3ed463f7..a7adcb6ec 100644 --- 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,7 +99,7 @@ public Mono>> 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, @@ -107,7 +107,7 @@ public Mono>> getOrgGroups(@RequestParam(r totalAdminsAndDevelopers, totalDevelopersOnly, totalOtherMembers, - subList.size(), + groupList.size(), pageNum, pageSize); }) diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java index 0a68beb8a..d6aa34203 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java @@ -106,7 +106,7 @@ private Mono getOrgMemberListView(String orgId, int page, int .filter(Objects::nonNull) .collect(Collectors.toList()); var pageTotal = list.size(); - list = list.subList(page * count, Math.min(page * count + count, pageTotal)); + list = list.subList((page - 1) * count, count == 0 ? pageTotal : Math.min(page * count, pageTotal)); return Pair.of(list, pageTotal); }); })