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 index d6606fde2..9b8741ebe 100644 --- 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 findByOrganizationDomainIsNotNull(); Mono existsBySlug(String slug); - - Flux findByIdInAndNameContainingIgnoreCase(List ids, String name, Pageable pageable); - Mono countByIdInAndNameContainingIgnoreCase(List ids, String name); + Flux findByIdInAndNameContainingIgnoreCaseAndState(List ids, String name, OrganizationState state, Pageable pageable); + Mono countByIdInAndNameContainingIgnoreCaseAndState(List 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 index 39c26d990..aa34543e7 100644 --- 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 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 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 index f3485477e..6fc6fecb1 100644 --- 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> 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) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy