Commitd12d09d

authored

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

Fixed pagination start value

2 parents6bf8b1c +3cf31b6 commitd12d09dCopy full SHA for d12d09d

File tree

-5

lines changed

server/api-service
- lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service
  - OrgMemberServiceImpl.java
- lowcoder-server/src/main/java/org/lowcoder/api/usermanagement

-5

lines changed

Lines changed: 1 addition & 1 deletion

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`	`publicFlux<OrgMember>getOrganizationMembers(StringorgId,intpage,intcount) {`
`56`		`-returnbiRelationService.getBySourceId(ORG_MEMBER,orgId,PageRequest.of(page,count))`
	`56`	`+returnbiRelationService.getBySourceId(ORG_MEMBER,orgId,PageRequest.of(page -1,count))`
`57`	`57`	`.map(OrgMember::from);`
`58`	`58`	`}`
`59`	`59`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public Mono<GroupMemberAggregateView> getGroupMembers(String groupId, int page,`
`98`	`98`	`.filter(Objects::nonNull)`
`99`	`99`	`.toList();`
`100`	`100`	`varpageTotal =list.size();`
`101`		`-list =list.subList(page count,Math.min(page count +count,pageTotal));`
	`101`	`+list =list.subList((page-1)count,count ==0 ?pageTotal :Math.min(page count,pageTotal));`
`102`	`102`	`returnPair.of(list,pageTotal);`
`103`	`103`	`});`
`104`	`104`	`})`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,15 +99,15 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r`
`99`	`99`	`.filter(orgMember -> !orgMember.isAdmin() && !orgMember.isSuperAdmin() &&`
`100`	`100`	`devMembers.stream().noneMatch(devMember ->devMember.getUserId().equals(orgMember.getUserId()))).toList().size();`
`101`	`101`
`102`		`-varsubList =groupList.subList((pageNum -1) pageSize,pageSize <=0?groupList.size():pageNum pageSize);`
	`102`	`+varsubList =groupList.subList((pageNum -1) pageSize,pageSize <=0?groupList.size():Math.min(pageNum pageSize,groupList.size()));`
`103`	`103`	`returnnewGroupListResponseView<>(ResponseView.SUCCESS,`
`104`	`104`	`"",`
`105`	`105`	`subList,`
`106`	`106`	`totalAdmins,`
`107`	`107`	`totalAdminsAndDevelopers,`
`108`	`108`	`totalDevelopersOnly,`
`109`	`109`	`totalOtherMembers,`
`110`		`-subList.size(),`
	`110`	`+groupList.size(),`
`111`	`111`	`pageNum,`
`112`	`112`	`pageSize);`
`113`	`113`	`})`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ private Mono<OrgMemberListView> getOrgMemberListView(String orgId, int page, int`
`106`	`106`	`.filter(Objects::nonNull)`
`107`	`107`	`.collect(Collectors.toList());`
`108`	`108`	`varpageTotal =list.size();`
`109`		`-list =list.subList(page count,Math.min(page count +count,pageTotal));`
	`109`	`+list =list.subList((page-1)count,count ==0 ?pageTotal :Math.min(page count,pageTotal));`
`110`	`110`	`returnPair.of(list,pageTotal);`
`111`	`111`	`});`
`112`	`112`	`})`

Comments

(0)