Commita6b3bda

authored

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

myorg endpoint

2 parents3d063e2 +10cf573 commita6b3bdaCopy full SHA for a6b3bda

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 3 deletions

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(Stringslug);`
`36`		`-`
`37`		`-Flux<Organization>findByIdInAndNameContainingIgnoreCase(List<String>ids,Stringname,Pageablepageable);`
`38`		`-Mono<Long>countByIdInAndNameContainingIgnoreCase(List<String>ids,Stringname);`
	`36`	`+Flux<Organization>findByIdInAndNameContainingIgnoreCaseAndState(List<String>ids,Stringname,OrganizationStatestate,Pageablepageable);`
	`37`	`+Mono<Long>countByIdInAndNameContainingIgnoreCaseAndState(List<String>ids,Stringname,OrganizationStatestate);`
`39`	`38`	`}`

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`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`importorg.lowcoder.sdk.config.CommonConfig;`
`24`	`24`	`importorg.lowcoder.sdk.constants.AuthSourceConstants;`
`25`	`25`	`importorg.lowcoder.sdk.exception.BizError;`
	`26`	`+importorg.springframework.data.domain.Sort;`
`26`	`27`	`importorg.springframework.http.HttpStatus;`
`27`	`28`	`importorg.springframework.http.codec.multipart.Part;`
`28`	`29`	`importorg.springframework.web.bind.annotation.*;`
`@@ -80,7 +81,7 @@ public Mono<ResponseView<?>> getUserOrgs(ServerWebExchange exchange,`
`80`	`81`	`@RequestParam(required =false,defaultValue ="10")IntegerpageSize) {`
`81`	`82`	`returnsessionUserService.getVisitor()`
`82`	`83`	`.flatMap(user -> {`
`83`		`-Pageablepageable =PageRequest.of(pageNum -1,pageSize);`
	`84`	`+Pageablepageable =PageRequest.of(pageNum -1,pageSize,Sort.by(Sort.Direction.DESC,"updatedAt"));`
`84`	`85`	`Stringfilter =orgName ==null ?"" :orgName;`
`85`	`86`	`returnorganizationService.findUserOrgs(user.getId(),filter,pageable)`
`86`	`87`	`.map(OrgView::new)`

Comments

(0)