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

Commit311bae7

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
page number start from 1
1 parenta28b90f commit311bae7

File tree

11 files changed

+14
-14
lines changed

11 files changed

+14
-14
lines changed

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,12 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
162162
@RequestParam(required =false)ApplicationStatusapplicationStatus,
163163
@RequestParam(defaultValue ="true")booleanwithContainerSize,
164164
@RequestParam(required =false)Stringname,
165-
@RequestParam(required =false,defaultValue ="0")IntegerpageNum,
165+
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
166166
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
167167
ApplicationTypeapplicationTypeEnum =applicationType ==null ?null :ApplicationType.fromValue(applicationType);
168168
varflux =userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum,applicationStatus,withContainerSize,name).cache();
169169
Mono<Long>countMono =flux.count();
170-
varflux1 =flux.skip((long)pageNum *pageSize);
170+
varflux1 =flux.skip((long)(pageNum -1) *pageSize);
171171
if(pageSize >0)flux1 =flux1.take(pageSize);
172172
returnflux1.collectList().zipWith(countMono)
173173
.map(tuple ->PageResponseView.success(tuple.getT1(),pageNum,pageSize,Math.toIntExact(tuple.getT2())));

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
167167
@RequestParam(required =false)ApplicationStatusapplicationStatus,
168168
@RequestParam(defaultValue ="true")booleanwithContainerSize,
169169
@RequestParam(required =false)Stringname,
170-
@RequestParam(required =false,defaultValue ="0")IntegerpageNum,
170+
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
171171
@RequestParam(required =false,defaultValue ="0")IntegerpageSize);
172172

173173
@Operation(

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public Mono<ResponseView<List<BundleInfoView>>> getRecycledBundles() {
106106
@Override
107107
publicMono<PageResponseView<?>>getElements(@PathVariableStringbundleId,
108108
@RequestParam(value ="applicationType",required =false)ApplicationTypeapplicationType,
109-
@RequestParam(required =false,defaultValue ="0")IntegerpageNum,
109+
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
110110
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
111111
StringobjectId =gidService.convertBundleIdToObjectId(bundleId);
112112
varflux =bundleApiService.getElements(objectId,applicationType).cache();

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleEndpoints.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public interface BundleEndpoints
123123
@GetMapping("/{bundleId}/elements")
124124
publicMono<PageResponseView<?>>getElements(@PathVariableStringbundleId,
125125
@RequestParam(value ="applicationType",required =false)ApplicationTypeapplicationType,
126-
@RequestParam(required =false,defaultValue ="0")IntegerpageNum,
126+
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
127127
@RequestParam(required =false,defaultValue ="0")IntegerpageSize);
128128

129129
@Operation(

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ public Mono<ResponseView<FolderInfoView>> update(@RequestBody Folder folder) {
7070
publicMono<PageResponseView<?>>getElements(@RequestParam(value ="id",required =false)StringfolderId,
7171
@RequestParam(value ="applicationType",required =false)ApplicationTypeapplicationType,
7272
@RequestParam(required =false)Stringname,
73-
@RequestParam(required =false,defaultValue ="0")IntegerpageNum,
73+
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
7474
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
7575
StringobjectId =gidService.convertFolderIdToObjectId(folderId);
7676
varflux =folderApiService.getElements(objectId,applicationType,name).cache();
7777
varcountMono =flux.count();
78-
varflux1 =flux.skip((long)pageNum *pageSize);
78+
varflux1 =flux.skip((long)(pageNum -1) *pageSize);
7979
if(pageSize >0)flux1 =flux1.take(pageSize);
8080
returnflux1.collectList()
8181
.delayUntil(__ ->folderApiService.upsertLastViewTime(objectId))

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderEndpoints.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public interface FolderEndpoints
7171
publicMono<PageResponseView<?>>getElements(@RequestParam(value ="id",required =false)StringfolderId,
7272
@RequestParam(value ="applicationType",required =false)ApplicationTypeapplicationType,
7373
@RequestParam(required =false)Stringname,
74-
@RequestParam(required =false,defaultValue ="0")IntegerpageNum,
74+
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
7575
@RequestParam(required =false,defaultValue ="0")IntegerpageSize);
7676

7777
@Operation(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public Mono<ResponseView<Boolean>> delete(@PathVariable String groupId) {
7575
}
7676

7777
@Override
78-
publicMono<GroupListResponseView<List<GroupView>>>getOrgGroups(@RequestParam(required =false,defaultValue ="0")IntegerpageNum,
78+
publicMono<GroupListResponseView<List<GroupView>>>getOrgGroups(@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
7979
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
8080
returngroupApiService.getGroups().flatMap(groupList -> {
8181
if(groupList.isEmpty())returnMono.just(newGroupListResponseView<>(ResponseView.SUCCESS,
@@ -99,7 +99,7 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
9999
.filter(orgMember -> !orgMember.isAdmin() && !orgMember.isSuperAdmin() &&
100100
devMembers.stream().noneMatch(devMember ->devMember.getUserId().equals(orgMember.getUserId()))).toList().size();
101101

102-
varsubList =groupList.subList(pageNum *pageSize,pageSize <=0?groupList.size():pageNum *pageSize +pageSize);
102+
varsubList =groupList.subList((pageNum-1)*pageSize,pageSize <=0?groupList.size():pageNum *pageSize);
103103
returnnewGroupListResponseView<>(ResponseView.SUCCESS,
104104
"",
105105
subList,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public Mono<ResponseView<Boolean>> update(@PathVariable String groupId,
6363
description ="Retrieve a list of User Groups within Lowcoder, providing an overview of available groups, based on the access rights of the currently impersonated User."
6464
)
6565
@GetMapping("/list")
66-
publicMono<GroupListResponseView<List<GroupView>>>getOrgGroups(@RequestParam(required =false,defaultValue ="0")IntegerpageNum,
66+
publicMono<GroupListResponseView<List<GroupView>>>getOrgGroups(@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
6767
@RequestParam(required =false,defaultValue ="0")IntegerpageSize);
6868

6969
@Operation(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class OrganizationController implements OrganizationEndpoints
5050

5151
@Override
5252
publicMono<PageResponseView<?>>getOrganizationByUser(@PathVariableStringemail,
53-
@RequestParam(required =false,defaultValue ="0")IntegerpageNum,
53+
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
5454
@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {
5555
varflux =userService.findByEmailDeep(email).flux().flatMap(user ->orgMemberService.getAllActiveOrgs(user.getId()))
5656
.flatMap(orgMember ->organizationService.getById(orgMember.getOrgId()))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public interface OrganizationEndpoints
4646
)
4747
@GetMapping("/byuser/{email}")
4848
publicMono<PageResponseView<?>>getOrganizationByUser(@PathVariableStringemail,
49-
@RequestParam(required =false,defaultValue ="0")IntegerpageNum,
49+
@RequestParam(required =false,defaultValue ="1")IntegerpageNum,
5050
@RequestParam(required =false,defaultValue ="0")IntegerpageSize);
5151

5252
@Operation(

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp