page number start from 1

Author: Thomasr

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

@@ -162,12 +162,12 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
             @RequestParam(required = false) ApplicationStatus applicationStatus,
             @RequestParam(defaultValue = "true") boolean withContainerSize,
             @RequestParam(required = false) String name,
-            @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+            @RequestParam(required = false, defaultValue = "1") Integer pageNum,
             @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
         ApplicationType applicationTypeEnum = applicationType == null ? null : ApplicationType.fromValue(applicationType);
         var flux = userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum, applicationStatus, withContainerSize, name).cache();
         Mono<Long> countMono = flux.count();
-        var flux1 = flux.skip((long) pageNum * pageSize);
+        var flux1 = flux.skip((long) (pageNum - 1) * pageSize);
         if(pageSize > 0) flux1 = flux1.take(pageSize);
         return flux1.collectList().zipWith(countMono)
                 .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

@@ -167,7 +167,7 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
             @RequestParam(required = false) ApplicationStatus applicationStatus,
             @RequestParam(defaultValue = "true") boolean withContainerSize,
 			@RequestParam(required = false) String name,
-			@RequestParam(required = false, defaultValue = "0") Integer pageNum,
+			@RequestParam(required = false, defaultValue = "1") Integer pageNum,
 			@RequestParam(required = false, defaultValue = "0") Integer pageSize);
 
 	@Operation(

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

@@ -106,7 +106,7 @@ public Mono<ResponseView<List<BundleInfoView>>> getRecycledBundles() {
     @Override
     public Mono<PageResponseView<?>> getElements(@PathVariable String bundleId,
                                                    @RequestParam(value = "applicationType", required = false) ApplicationType applicationType,
-                                                   @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+                                                   @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                                                    @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
         String objectId = gidService.convertBundleIdToObjectId(bundleId);
         var flux = bundleApiService.getElements(objectId, applicationType).cache();

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

@@ -123,7 +123,7 @@ public interface BundleEndpoints
     @GetMapping("/{bundleId}/elements")
     public Mono<PageResponseView<?>> getElements(@PathVariable String bundleId,
 												 @RequestParam(value = "applicationType", required = false) ApplicationType applicationType,
-												 @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+												 @RequestParam(required = false, defaultValue = "1") Integer pageNum,
 												 @RequestParam(required = false, defaultValue = "0") Integer pageSize);
 
 	@Operation(

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

@@ -70,12 +70,12 @@ public Mono<ResponseView<FolderInfoView>> update(@RequestBody Folder folder) {
     public Mono<PageResponseView<?>> getElements(@RequestParam(value = "id", required = false) String folderId,
                                                  @RequestParam(value = "applicationType", required = false) ApplicationType applicationType,
                                                  @RequestParam(required = false) String name,
-                                                 @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+                                                 @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                                                  @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
         String objectId = gidService.convertFolderIdToObjectId(folderId);
         var flux = folderApiService.getElements(objectId, applicationType, name).cache();
         var countMono = flux.count();
-        var flux1 = flux.skip((long) pageNum * pageSize);
+        var flux1 = flux.skip((long) (pageNum - 1) * pageSize);
         if(pageSize > 0) flux1 = flux1.take(pageSize);
         return flux1.collectList()
             .delayUntil(__ -> folderApiService.upsertLastViewTime(objectId))

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

@@ -71,7 +71,7 @@ public interface FolderEndpoints
     public Mono<PageResponseView<?>> getElements(@RequestParam(value = "id", required = false) String folderId,
 												 @RequestParam(value = "applicationType", required = false) ApplicationType applicationType,
 												 @RequestParam(required = false) String name,
-												 @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+												 @RequestParam(required = false, defaultValue = "1") Integer pageNum,
 												 @RequestParam(required = false, defaultValue = "0") Integer pageSize);
 
 	@Operation(

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

@@ -75,7 +75,7 @@ public Mono<ResponseView<Boolean>> delete(@PathVariable String groupId) {
     }
 
     @Override
-    public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(required = false, defaultValue = "0") Integer pageNum,
+    public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
             @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
         return groupApiService.getGroups().flatMap(groupList -> {
             if(groupList.isEmpty()) return Mono.just(new GroupListResponseView<>(ResponseView.SUCCESS,
@@ -99,7 +99,7 @@ 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 * pageSize, pageSize <= 0?groupList.size():pageNum * pageSize + pageSize);
+                        var subList = groupList.subList((pageNum - 1) * pageSize, pageSize <= 0?groupList.size():pageNum * pageSize);
                         return new GroupListResponseView<>(ResponseView.SUCCESS,
                             "",
                             subList,

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

@@ -63,7 +63,7 @@ public Mono<ResponseView<Boolean>> update(@PathVariable String groupId,
 		    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."
 	)
     @GetMapping("/list")
-    public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(required = false, defaultValue = "0") Integer pageNum,
+    public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
 			@RequestParam(required = false, defaultValue = "0") Integer pageSize);
 
 	@Operation(

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

@@ -50,7 +50,7 @@ public class OrganizationController implements OrganizationEndpoints
 
     @Override
     public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String email,
-                                                           @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+                                                           @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                                                            @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
         var flux = userService.findByEmailDeep(email).flux().flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
                 .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))

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

@@ -46,7 +46,7 @@ public interface OrganizationEndpoints
 	)
     @GetMapping("/byuser/{email}")
     public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String email,
-														   @RequestParam(required = false, defaultValue = "0") Integer pageNum,
+														   @RequestParam(required = false, defaultValue = "1") Integer pageNum,
 														   @RequestParam(required = false, defaultValue = "0") Integer pageSize);
 
 	@Operation(