Commit5015a71

Thomasr

committed

Filter orgs to return only those with an active state.

1 parent1889d6c commit5015a71Copy full SHA for 5015a71

File tree

-4

lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization
- repository
  - OrganizationRepository.java
- service
  - OrganizationServiceImpl.java

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ public interface OrganizationRepository extends ReactiveMongoRepository<Organiza`
`34`	`34`	`Flux<Organization>findByOrganizationDomainIsNotNull();`
`35`	`35`	`Mono<Boolean>existsBySlug(Stringslug);`
`36`	`36`
`37`		`-Flux<Organization>findByIdInAndNameContainingIgnoreCase(List<String>ids,Stringname,Pageablepageable);`
`38`		`-Mono<Long>countByIdInAndNameContainingIgnoreCase(List<String>ids,Stringname);`
	`37`	`+Flux<Organization>findByIdInAndNameContainingIgnoreCaseAndState(List<String>ids,Stringname,OrganizationStatestate,Pageablepageable);`
	`38`	`+Mono<Long>countByIdInAndNameContainingIgnoreCaseAndState(List<String>ids,Stringname,OrganizationStatestate);`
`39`	`39`	`}`

Lines changed: 2 additions & 2 deletions

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`	`returnFlux.empty();`
`332`	`332`	`}`
`333`		`-returnrepository.findByIdInAndNameContainingIgnoreCase(orgIds,orgName,pageable);`
	`333`	`+returnrepository.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`	`returnMono.just(0L);`
`346`	`346`	`}`
`347`		`-returnrepository.countByIdInAndNameContainingIgnoreCase(orgIds,filter);`
	`347`	`+returnrepository.countByIdInAndNameContainingIgnoreCaseAndState(orgIds,filter,ACTIVE);`
`348`	`348`	`});`
`349`	`349`	`}`
`350`	`350`	`}`

Comments

(0)