Merge pull request #1777 from lowcoder-org/fix/myorg

ludomikula · web-flow · commit a6b3bda019e7 · 2025-06-18T21:44:21.000+02:00
myorg endpoint
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/repository/OrganizationRepository.java
@@ -33,7 +33,6 @@ public interface OrganizationRepository extends ReactiveMongoRepository<Organiza
 
     Flux<Organization> findByOrganizationDomainIsNotNull();
     Mono<Boolean> existsBySlug(String slug);
-
-    Flux<Organization> findByIdInAndNameContainingIgnoreCase(List<String> ids, String name, Pageable pageable);
-    Mono<Long> countByIdInAndNameContainingIgnoreCase(List<String> ids, String name);
+    Flux<Organization> findByIdInAndNameContainingIgnoreCaseAndState(List<String> ids, String name, OrganizationState state, Pageable pageable);
+    Mono<Long> countByIdInAndNameContainingIgnoreCaseAndState(List<String> ids, String name, OrganizationState state);
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java
@@ -330,7 +330,7 @@ public Flux<Organization> findUserOrgs(String userId, String orgName, Pageable p
                     if (orgIds.isEmpty()) {
                         return Flux.empty();
                     }
-                    return repository.findByIdInAndNameContainingIgnoreCase(orgIds, orgName, pageable);
+                    return repository.findByIdInAndNameContainingIgnoreCaseAndState(orgIds, orgName, ACTIVE, pageable);
                 });
     }
 
@@ -344,7 +344,7 @@ public Mono<Long> countUserOrgs(String userId, String orgName) {
                     if (orgIds.isEmpty()) {
                         return Mono.just(0L);
                     }
-                    return repository.countByIdInAndNameContainingIgnoreCase(orgIds, filter);
+                    return repository.countByIdInAndNameContainingIgnoreCaseAndState(orgIds, filter, ACTIVE);
                 });
     }
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/UserController.java
@@ -23,6 +23,7 @@
 import org.lowcoder.sdk.config.CommonConfig;
 import org.lowcoder.sdk.constants.AuthSourceConstants;
 import org.lowcoder.sdk.exception.BizError;
+import org.springframework.data.domain.Sort;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.codec.multipart.Part;
 import org.springframework.web.bind.annotation.*;
@@ -80,7 +81,7 @@ public Mono<ResponseView<?>> getUserOrgs(ServerWebExchange exchange,
                                              @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
         return sessionUserService.getVisitor()
                 .flatMap(user -> {
-                    Pageable pageable = PageRequest.of(pageNum - 1, pageSize);
+                    Pageable pageable = PageRequest.of(pageNum - 1, pageSize, Sort.by(Sort.Direction.DESC, "updatedAt"));
                     String filter = orgName == null ? "" : orgName;
                     return organizationService.findUserOrgs(user.getId(), filter, pageable)
                             .map(OrgView::new)

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public interface OrganizationRepository extends ReactiveMongoRepository<Organiza`
`33`	`33`
`34`	`34`	`Flux<Organization> findByOrganizationDomainIsNotNull();`
`35`	`35`	`Mono<Boolean> existsBySlug(String slug);`
`36`		`-`
`37`		`- Flux<Organization> findByIdInAndNameContainingIgnoreCase(List<String> ids, String name, Pageable pageable);`
`38`		`- Mono<Long> countByIdInAndNameContainingIgnoreCase(List<String> ids, String name);`
	`36`	`+ Flux<Organization> findByIdInAndNameContainingIgnoreCaseAndState(List<String> ids, String name, OrganizationState state, Pageable pageable);`
	`37`	`+ Mono<Long> countByIdInAndNameContainingIgnoreCaseAndState(List<String> ids, String name, OrganizationState state);`
`39`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ public Flux<Organization> findUserOrgs(String userId, String orgName, Pageable p`
`330`	`330`	`if (orgIds.isEmpty()) {`
`331`	`331`	`return Flux.empty();`
`332`	`332`	`}`
`333`		`- return repository.findByIdInAndNameContainingIgnoreCase(orgIds, orgName, pageable);`
	`333`	`+ return repository.findByIdInAndNameContainingIgnoreCaseAndState(orgIds, orgName, ACTIVE, pageable);`
`334`	`334`	`});`
`335`	`335`	`}`
`336`	`336`
`@@ -344,7 +344,7 @@ public Mono<Long> countUserOrgs(String userId, String orgName) {`
`344`	`344`	`if (orgIds.isEmpty()) {`
`345`	`345`	`return Mono.just(0L);`
`346`	`346`	`}`
`347`		`- return repository.countByIdInAndNameContainingIgnoreCase(orgIds, filter);`
	`347`	`+ return repository.countByIdInAndNameContainingIgnoreCaseAndState(orgIds, filter, ACTIVE);`
`348`	`348`	`});`
`349`	`349`	`}`
`350`	`350`	`}`