Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitd509dc7

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
Fixed pagination for myorg endpoint.
1 parent68b9513 commitd509dc7

File tree

1 file changed

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

1 file changed

+17
-20
lines changed

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

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
importreactor.core.publisher.Flux;
3131
importreactor.core.publisher.Mono;
3232

33+
importjava.util.List;
34+
3335
importstaticorg.lowcoder.sdk.exception.BizError.INVALID_USER_STATUS;
3436
importstaticorg.lowcoder.sdk.util.ExceptionUtils.ofError;
3537

@@ -70,30 +72,25 @@ public Mono<ResponseView<?>> getUserProfile(ServerWebExchange exchange) {
7072

7173
@Override
7274
publicMono<ResponseView<?>>getUserOrgs(ServerWebExchangeexchange,
73-
@RequestParam(required =false)StringorgName,
74-
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
75-
@RequestParam(required =false,defaultValue ="10")IntegerpageSize) {
75+
@RequestParam(required =false)StringorgName,
76+
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
77+
@RequestParam(required =false,defaultValue ="10")IntegerpageSize) {
7678
returnsessionUserService.getVisitor()
7779
.flatMap(user -> {
78-
// Get all active organizations for the user
7980
Flux<OrgMember>orgMemberFlux =orgMemberService.getAllActiveOrgs(user.getId());
80-
81-
// If orgName filter is provided, filter organizations by name
82-
if (StringUtils.isNotBlank(orgName)) {
83-
returnorgMemberFlux
84-
.flatMap(orgMember ->organizationService.getById(orgMember.getOrgId()))
85-
.filter(org ->StringUtils.containsIgnoreCase(org.getName(),orgName))
86-
.map(OrgView::new)
87-
.collectList()
88-
.map(orgs ->PageResponseView.success(orgs,pageNum,pageSize,orgs.size()));
89-
}
90-
91-
// If no filter, return all organizations
92-
returnorgMemberFlux
81+
82+
Flux<OrgView>orgViewFlux =orgMemberFlux
9383
.flatMap(orgMember ->organizationService.getById(orgMember.getOrgId()))
94-
.map(OrgView::new)
95-
.collectList()
96-
.map(orgs ->PageResponseView.success(orgs,pageNum,pageSize,orgs.size()));
84+
.filter(org ->StringUtils.isBlank(orgName) ||StringUtils.containsIgnoreCase(org.getName(),orgName))
85+
.map(OrgView::new);
86+
87+
returnorgViewFlux.collectList().map(orgs -> {
88+
inttotal =orgs.size();
89+
intfromIndex =Math.max((pageNum -1) *pageSize,0);
90+
inttoIndex =Math.min(fromIndex +pageSize,total);
91+
List<OrgView>pagedOrgs =fromIndex <toIndex ?orgs.subList(fromIndex,toIndex) :List.of();
92+
returnPageResponseView.success(pagedOrgs,pageNum,pageSize,total);
93+
});
9794
})
9895
.map(ResponseView::success);
9996
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp