search ancestorDNA

This commit is contained in:
kittapath 2025-01-30 09:09:48 +07:00
parent 30adede096
commit eb09c6205a

View file

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