Fixed pagination start value

lowcoder-org · Nov 27, 2024 · 29689c8 · 29689c8
1 parent 91215b2
commit 29689c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...r-domain/src/main/java/org/lowcoder/domain/organization/service/OrgMemberServiceImpl.java b/...r-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/...ce/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java b/...ce/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/...vice/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java b/...vice/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);
                     });
                 })