diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index 0ea95f16..976ad9b0 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -2381,6 +2381,7 @@ export class OrganizationController extends Controller { ) .select([ "orgRoot.id", + "orgRoot.misId", "orgRoot.isDeputy", "orgRoot.orgRootName", "orgRoot.orgRootShortName", @@ -2414,6 +2415,7 @@ export class OrganizationController extends Controller { ) .select([ "orgChild1.id", + "orgChild1.misId", "orgChild1.isOfficer", "orgChild1.orgChild1Name", "orgChild1.orgChild1ShortName", @@ -2449,6 +2451,7 @@ export class OrganizationController extends Controller { ) .select([ "orgChild2.id", + "orgChild2.misId", "orgChild2.orgChild2Name", "orgChild2.orgChild2ShortName", "orgChild2.orgChild2Code", @@ -2484,6 +2487,7 @@ export class OrganizationController extends Controller { ) .select([ "orgChild3.id", + "orgChild3.misId", "orgChild3.orgChild3Name", "orgChild3.orgChild3ShortName", "orgChild3.orgChild3Code", @@ -2519,6 +2523,7 @@ export class OrganizationController extends Controller { ) .select([ "orgChild4.id", + "orgChild4.misId", "orgChild4.orgChild4Name", "orgChild4.orgChild4ShortName", "orgChild4.orgChild4Code", @@ -2542,6 +2547,7 @@ export class OrganizationController extends Controller { return { orgTreeId: orgRoot.id, orgLevel: 0, + misId: orgRoot.misId, orgName: orgRoot.orgRootName, orgTreeName: orgRoot.orgRootName, orgTreeShortName: orgRoot.orgRootShortName, @@ -2652,6 +2658,7 @@ export class OrganizationController extends Controller { orgTreeId: orgChild1.id, orgRootId: orgRoot.id, orgLevel: 1, + misId: orgChild1.misId, orgName: `${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`, orgTreeName: orgChild1.orgChild1Name, orgTreeShortName: orgChild1.orgChild1ShortName, @@ -2775,6 +2782,7 @@ export class OrganizationController extends Controller { orgTreeId: orgChild2.id, orgRootId: orgChild1.id, orgLevel: 2, + misId: orgChild2.misId, orgName: `${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`, orgTreeName: orgChild2.orgChild2Name, orgTreeShortName: orgChild2.orgChild2ShortName, @@ -2907,6 +2915,7 @@ export class OrganizationController extends Controller { orgTreeId: orgChild3.id, orgRootId: orgChild2.id, orgLevel: 3, + misId: orgChild3.misId, orgName: `${orgChild3.orgChild3Name}/${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`, orgTreeName: orgChild3.orgChild3Name, orgTreeShortName: orgChild3.orgChild3ShortName, @@ -3046,6 +3055,7 @@ export class OrganizationController extends Controller { orgTreeId: orgChild4.id, orgRootId: orgChild3.id, orgLevel: 4, + misId: orgChild4.misId, orgName: `${orgChild4.orgChild4Name}/${orgChild3.orgChild3Name}/${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`, orgTreeName: orgChild4.orgChild4Name, orgTreeShortName: orgChild4.orgChild4ShortName, @@ -5468,32 +5478,30 @@ export class OrganizationController extends Controller { * */ @Post("find/node-all") - async findNodeAllOrg( - @Body() requestBody: { node: number | null; nodeId: string | null }, - ) { + async findNodeAllOrg(@Body() requestBody: { node: number | null; nodeId: string | null }) { let orgRootRankSub1 = ["BUREAU", "OFFICE"]; - let orgRootRankSub2 = [ "DISTRICT"]; - let data1:any - let data2:any + let orgRootRankSub2 = ["DISTRICT"]; + let data1: any; + let data2: any; switch (requestBody.node) { case 0: { const _data1 = await this.orgRootRepository.find({ where: { - id: requestBody.nodeId ?? "", - orgRootRankSub: In(orgRootRankSub1) + id: requestBody.nodeId ?? "", + orgRootRankSub: In(orgRootRankSub1), }, order: { orgRootOrder: "ASC" }, }); const _data2 = await this.orgRootRepository.find({ where: [ { - id: requestBody.nodeId ?? "", - orgRootRankSub: In(orgRootRankSub2) + id: requestBody.nodeId ?? "", + orgRootRankSub: In(orgRootRankSub2), }, { - id: requestBody.nodeId ?? "", - orgRootRankSub: IsNull() - } + id: requestBody.nodeId ?? "", + orgRootRankSub: IsNull(), + }, ], order: { orgRootOrder: "ASC" }, }); @@ -5515,7 +5523,7 @@ export class OrganizationController extends Controller { })); break; } - // case 1: { + // case 1: { // const data = await this.child1Repository.find({ // where: { id: requestBody.nodeId }, // }); @@ -5584,7 +5592,7 @@ export class OrganizationController extends Controller { })); } } - return new HttpSuccess({isRootTrue: data1, isRootFalse: data2}) + return new HttpSuccess({ isRootTrue: data1, isRootFalse: data2 }); } /**