From ded2da6361fd8d80e1e732f127df605e05922829 Mon Sep 17 00:00:00 2001 From: kittapath Date: Sat, 11 Jan 2025 11:53:38 +0700 Subject: [PATCH] find org --- src/controllers/OrganizationController.ts | 58 ++++++++++++----------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index 547bd035..f20ac340 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -5468,11 +5468,15 @@ export class OrganizationController extends Controller { * */ @Post("find/node-all") - async findNodeAllOrg(@Body() requestBody: { node: number; nodeId: string }) { + async findNodeAllOrg(@Body() requestBody: { node: number; nodeId: string; isRoot: boolean }) { + let orgRootRankSub = ["DISTRICT"]; + if (requestBody.isRoot == true) { + orgRootRankSub = ["BUREAU", "OFFICE"]; + } switch (requestBody.node) { case 0: { const data = await this.orgRootRepository.find({ - where: { id: requestBody.nodeId }, + where: { id: requestBody.nodeId, orgRootRankSub: In(orgRootRankSub) }, }); return new HttpSuccess( data.map((y) => ({ @@ -5485,30 +5489,30 @@ export class OrganizationController extends Controller { })), ); } - case 1: { - const data = await this.child1Repository.find({ - where: { id: requestBody.nodeId }, - }); - return new HttpSuccess(data); - } - case 2: { - const data = await this.child2Repository.find({ - where: { id: requestBody.nodeId }, - }); - return new HttpSuccess(data); - } - case 3: { - const data = await this.child3Repository.find({ - where: { id: requestBody.nodeId }, - }); - return new HttpSuccess(data); - } - case 4: { - const data = await this.child4Repository.find({ - where: { id: requestBody.nodeId }, - }); - return new HttpSuccess(data); - } + // case 1: { + // const data = await this.child1Repository.find({ + // where: { id: requestBody.nodeId }, + // }); + // return new HttpSuccess(data); + // } + // case 2: { + // const data = await this.child2Repository.find({ + // where: { id: requestBody.nodeId }, + // }); + // return new HttpSuccess(data); + // } + // case 3: { + // const data = await this.child3Repository.find({ + // where: { id: requestBody.nodeId }, + // }); + // return new HttpSuccess(data); + // } + // case 4: { + // const data = await this.child4Repository.find({ + // where: { id: requestBody.nodeId }, + // }); + // return new HttpSuccess(data); + // } default: { const data = await this.orgRootRepository.find({ where: { @@ -5516,6 +5520,7 @@ export class OrganizationController extends Controller { orgRevisionIsCurrent: true, orgRevisionIsDraft: false, }, + orgRootRankSub: In(orgRootRankSub), }, }); return new HttpSuccess( @@ -5528,7 +5533,6 @@ export class OrganizationController extends Controller { child4Id: null, })), ); - return new HttpSuccess(data); } } }