Merge pull request #1344 from lowcoder-org/fix/pagination

FalkWolsky · web-flow · commit d12d09d4f76c · 2024-11-27T14:03:39.000+01:00
Fixed pagination start value
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
@@ -53,7 +53,7 @@ public Flux<OrgMember> getOrganizationMembers(String orgId) {
 
     @Override
     public Flux<OrgMember> 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
@@ -98,7 +98,7 @@ public Mono<GroupMemberAggregateView> 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
@@ -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);
                     })
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
@@ -106,7 +106,7 @@ private Mono<OrgMemberListView> 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);
                     });
                 })

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public Flux<OrgMember> getOrganizationMembers(String orgId) {`
`53`	`53`
`54`	`54`	`@Override`
`55`	`55`	`public Flux<OrgMember> getOrganizationMembers(String orgId, int page, int count) {`
`56`		`- return biRelationService.getBySourceId(ORG_MEMBER, orgId, PageRequest.of(page, count))`
	`56`	`+ return biRelationService.getBySourceId(ORG_MEMBER, orgId, PageRequest.of(page - 1, count))`
`57`	`57`	`.map(OrgMember::from);`
`58`	`58`	`}`
`59`	`59`