diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts index 7c6546c3..2402545b 100644 --- a/src/controllers/OrganizationController.ts +++ b/src/controllers/OrganizationController.ts @@ -6552,7 +6552,8 @@ export class OrganizationController extends Controller { const formattedData = await Promise.all( orgRootData.map(async (orgRoot) => { return { - orgTreeId: orgRoot.id, + orgTreeId: orgRoot.ancestorDNA, + orgTreeDnaId: orgRoot.ancestorDNA, orgLevel: 0, orgName: orgRoot.orgRootName, orgTreeName: orgRoot.orgRootName, @@ -6660,8 +6661,10 @@ export class OrganizationController extends Controller { orgChild1Data .filter((orgChild1) => orgChild1.orgRootId === orgRoot.id) .map(async (orgChild1) => ({ - orgTreeId: orgChild1.id, + orgTreeId: orgChild1.ancestorDNA, + orgTreeDnaId: orgChild1.ancestorDNA, orgRootId: orgRoot.id, + orgRootDnaId: orgRoot.ancestorDNA, orgLevel: 1, orgName: `${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`, orgTreeName: orgChild1.orgChild1Name, @@ -6782,8 +6785,10 @@ export class OrganizationController extends Controller { orgChild2Data .filter((orgChild2) => orgChild2.orgChild1Id === orgChild1.id) .map(async (orgChild2) => ({ - orgTreeId: orgChild2.id, + orgTreeId: orgChild2.ancestorDNA, + orgTreeDnaId: orgChild2.ancestorDNA, orgRootId: orgChild1.id, + orgRootDnaId: orgChild1.ancestorDNA, orgLevel: 2, orgName: `${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`, orgTreeName: orgChild2.orgChild2Name, @@ -6914,8 +6919,10 @@ export class OrganizationController extends Controller { orgChild3Data .filter((orgChild3) => orgChild3.orgChild2Id === orgChild2.id) .map(async (orgChild3) => ({ - orgTreeId: orgChild3.id, + orgTreeId: orgChild3.ancestorDNA, + orgTreeDnaId: orgChild3.ancestorDNA, orgRootId: orgChild2.id, + orgRootDnaId: orgChild2.ancestorDNA, orgLevel: 3, orgName: `${orgChild3.orgChild3Name}/${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`, orgTreeName: orgChild3.orgChild3Name, @@ -7053,8 +7060,10 @@ export class OrganizationController extends Controller { orgChild4Data .filter((orgChild4) => orgChild4.orgChild3Id === orgChild3.id) .map(async (orgChild4) => ({ - orgTreeId: orgChild4.id, + orgTreeId: orgChild4.ancestorDNA, + orgTreeDnaId: orgChild4.ancestorDNA, orgRootId: orgChild3.id, + orgRootDnaId: orgChild3.ancestorDNA, orgLevel: 4, orgName: `${orgChild4.orgChild4Name}/${orgChild3.orgChild3Name}/${orgChild2.orgChild2Name}/${orgChild1.orgChild1Name}/${orgRoot.orgRootName}`, orgTreeName: orgChild4.orgChild4Name,