edit ancestorDNA

This commit is contained in:
kittapath 2025-01-30 08:52:47 +07:00
parent 8eac85385c
commit b48bec206f
2 changed files with 35 additions and 10 deletions

View file

@ -5625,6 +5625,7 @@ export class OrganizationController extends Controller {
} }
return new HttpSuccess({ return new HttpSuccess({
rootId: data.id, rootId: data.id,
rootDnaId: data.ancestorDNA,
root: data.orgRootName, root: data.orgRootName,
rootShortName: data.orgRootShortName, rootShortName: data.orgRootShortName,
}); });
@ -5641,9 +5642,11 @@ export class OrganizationController extends Controller {
} }
return new HttpSuccess({ return new HttpSuccess({
rootId: data.orgRootId, rootId: data.orgRootId,
rootDnaId: data.ancestorDNA,
root: data.orgRoot == null ? null : data.orgRoot.orgRootName, root: data.orgRoot == null ? null : data.orgRoot.orgRootName,
rootShortName: data.orgRoot == null ? null : data.orgRoot.orgRootShortName, rootShortName: data.orgRoot == null ? null : data.orgRoot.orgRootShortName,
child1Id: data.id, child1Id: data.id,
child1DnaId: data.ancestorDNA,
child1: data.orgChild1Name, child1: data.orgChild1Name,
child1ShortName: data.orgChild1ShortName, child1ShortName: data.orgChild1ShortName,
}); });
@ -5661,12 +5664,15 @@ export class OrganizationController extends Controller {
} }
return new HttpSuccess({ return new HttpSuccess({
rootId: data.orgRootId, rootId: data.orgRootId,
rootDnaId: data.ancestorDNA,
root: data.orgRoot == null ? null : data.orgRoot.orgRootName, root: data.orgRoot == null ? null : data.orgRoot.orgRootName,
rootShortName: data.orgRoot == null ? null : data.orgRoot.orgRootShortName, rootShortName: data.orgRoot == null ? null : data.orgRoot.orgRootShortName,
child1Id: data.orgChild1Id, child1Id: data.orgChild1Id,
child1DnaId: data.ancestorDNA,
child1: data.orgChild1 == null ? null : data.orgChild1.orgChild1Name, child1: data.orgChild1 == null ? null : data.orgChild1.orgChild1Name,
child1ShortName: data.orgChild1 == null ? null : data.orgChild1.orgChild1ShortName, child1ShortName: data.orgChild1 == null ? null : data.orgChild1.orgChild1ShortName,
child2Id: data.id, child2Id: data.id,
child2DnaId: data.ancestorDNA,
child2: data.orgChild2Name, child2: data.orgChild2Name,
child2ShortName: data.orgChild2ShortName, child2ShortName: data.orgChild2ShortName,
}); });
@ -5685,15 +5691,19 @@ export class OrganizationController extends Controller {
} }
return new HttpSuccess({ return new HttpSuccess({
rootId: data.orgRootId, rootId: data.orgRootId,
rootDnaId: data.ancestorDNA,
root: data.orgRoot == null ? null : data.orgRoot.orgRootName, root: data.orgRoot == null ? null : data.orgRoot.orgRootName,
rootShortName: data.orgRoot == null ? null : data.orgRoot.orgRootShortName, rootShortName: data.orgRoot == null ? null : data.orgRoot.orgRootShortName,
child1Id: data.orgChild1Id, child1Id: data.orgChild1Id,
child1DnaId: data.ancestorDNA,
child1: data.orgChild1 == null ? null : data.orgChild1.orgChild1Name, child1: data.orgChild1 == null ? null : data.orgChild1.orgChild1Name,
child1ShortName: data.orgChild1 == null ? null : data.orgChild1.orgChild1ShortName, child1ShortName: data.orgChild1 == null ? null : data.orgChild1.orgChild1ShortName,
child2Id: data.orgChild2Id, child2Id: data.orgChild2Id,
child2DnaId: data.ancestorDNA,
child2: data.orgChild2 == null ? null : data.orgChild2.orgChild2Name, child2: data.orgChild2 == null ? null : data.orgChild2.orgChild2Name,
child2ShortName: data.orgChild2 == null ? null : data.orgChild2.orgChild2ShortName, child2ShortName: data.orgChild2 == null ? null : data.orgChild2.orgChild2ShortName,
child3Id: data.id, child3Id: data.id,
child3DnaId: data.ancestorDNA,
child3: data.orgChild3Name, child3: data.orgChild3Name,
child3ShortName: data.orgChild3ShortName, child3ShortName: data.orgChild3ShortName,
}); });
@ -5713,18 +5723,23 @@ export class OrganizationController extends Controller {
} }
return new HttpSuccess({ return new HttpSuccess({
rootId: data.orgRootId, rootId: data.orgRootId,
rootDnaId: data.ancestorDNA,
root: data.orgRoot == null ? null : data.orgRoot.orgRootName, root: data.orgRoot == null ? null : data.orgRoot.orgRootName,
rootShortName: data.orgRoot == null ? null : data.orgRoot.orgRootShortName, rootShortName: data.orgRoot == null ? null : data.orgRoot.orgRootShortName,
child1Id: data.orgChild1Id, child1Id: data.orgChild1Id,
child1DnaId: data.ancestorDNA,
child1: data.orgChild1 == null ? null : data.orgChild1.orgChild1Name, child1: data.orgChild1 == null ? null : data.orgChild1.orgChild1Name,
child1ShortName: data.orgChild1 == null ? null : data.orgChild1.orgChild1ShortName, child1ShortName: data.orgChild1 == null ? null : data.orgChild1.orgChild1ShortName,
child2Id: data.orgChild2Id, child2Id: data.orgChild2Id,
child2DnaId: data.ancestorDNA,
child2: data.orgChild2 == null ? null : data.orgChild2.orgChild2Name, child2: data.orgChild2 == null ? null : data.orgChild2.orgChild2Name,
child2ShortName: data.orgChild2 == null ? null : data.orgChild2.orgChild2ShortName, child2ShortName: data.orgChild2 == null ? null : data.orgChild2.orgChild2ShortName,
child3Id: data.orgChild3Id, child3Id: data.orgChild3Id,
child3DnaId: data.ancestorDNA,
child3: data.orgChild3 == null ? null : data.orgChild3.orgChild3Name, child3: data.orgChild3 == null ? null : data.orgChild3.orgChild3Name,
child3ShortName: data.orgChild3 == null ? null : data.orgChild3.orgChild3ShortName, child3ShortName: data.orgChild3 == null ? null : data.orgChild3.orgChild3ShortName,
child4Id: data.id, child4Id: data.id,
child4DnaId: data.ancestorDNA,
child4: data.orgChild4Name, child4: data.orgChild4Name,
child4ShortName: data.orgChild4ShortName, child4ShortName: data.orgChild4ShortName,
}); });

View file

@ -5321,19 +5321,24 @@ export class ProfileController extends Controller {
: position.posExecutive.posExecutivePriority, : position.posExecutive.posExecutivePriority,
posExecutiveId: posExecutiveId:
position == null || position.posExecutive == null ? null : position.posExecutive.id, position == null || position.posExecutive == null ? null : position.posExecutive.id,
rootId: root == null ? null : root.id, rootId: root == null ? null : root.ancestorDNA,
rootDnaId: root == null ? null : root.ancestorDNA,
root: root == null ? null : root.orgRootName, root: root == null ? null : root.orgRootName,
rootShortName: root == null ? null : root.orgRootShortName, rootShortName: root == null ? null : root.orgRootShortName,
child1Id: child1 == null ? null : child1.id, child1Id: child1 == null ? null : child1.ancestorDNA,
child1DnaId: child1 == null ? null : child1.ancestorDNA,
child1: child1 == null ? null : child1.orgChild1Name, child1: child1 == null ? null : child1.orgChild1Name,
child1ShortName: child1 == null ? null : child1.orgChild1ShortName, child1ShortName: child1 == null ? null : child1.orgChild1ShortName,
child2Id: child2 == null ? null : child2.id, child2Id: child2 == null ? null : child2.ancestorDNA,
child2DnaId: child2 == null ? null : child2.ancestorDNA,
child2: child2 == null ? null : child2.orgChild2Name, child2: child2 == null ? null : child2.orgChild2Name,
child2ShortName: child2 == null ? null : child2.orgChild2ShortName, child2ShortName: child2 == null ? null : child2.orgChild2ShortName,
child3Id: child3 == null ? null : child3.id, child3Id: child3 == null ? null : child3.ancestorDNA,
child3DnaId: child3 == null ? null : child3.ancestorDNA,
child3: child3 == null ? null : child3.orgChild3Name, child3: child3 == null ? null : child3.orgChild3Name,
child3ShortName: child3 == null ? null : child3.orgChild3ShortName, child3ShortName: child3 == null ? null : child3.orgChild3ShortName,
child4Id: child4 == null ? null : child4.id, child4Id: child4 == null ? null : child4.ancestorDNA,
child4DnaId: child4 == null ? null : child4.ancestorDNA,
child4: child4 == null ? null : child4.orgChild4Name, child4: child4 == null ? null : child4.orgChild4Name,
child4ShortName: child4 == null ? null : child4.orgChild4ShortName, child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
node: null, node: null,
@ -5467,19 +5472,24 @@ export class ProfileController extends Controller {
: position.posExecutive.posExecutivePriority, : position.posExecutive.posExecutivePriority,
posExecutiveId: posExecutiveId:
position == null || position.posExecutive == null ? null : position.posExecutive.id, position == null || position.posExecutive == null ? null : position.posExecutive.id,
rootId: root == null ? null : root.id, rootId: root == null ? null : root.ancestorDNA,
rootDnaId: root == null ? null : root.ancestorDNA,
root: root == null ? null : root.orgRootName, root: root == null ? null : root.orgRootName,
rootShortName: root == null ? null : root.orgRootShortName, rootShortName: root == null ? null : root.orgRootShortName,
child1Id: child1 == null ? null : child1.id, child1Id: child1 == null ? null : child1.ancestorDNA,
child1DnaId: child1 == null ? null : child1.ancestorDNA,
child1: child1 == null ? null : child1.orgChild1Name, child1: child1 == null ? null : child1.orgChild1Name,
child1ShortName: child1 == null ? null : child1.orgChild1ShortName, child1ShortName: child1 == null ? null : child1.orgChild1ShortName,
child2Id: child2 == null ? null : child2.id, child2Id: child2 == null ? null : child2.ancestorDNA,
child2DnaId: child2 == null ? null : child2.ancestorDNA,
child2: child2 == null ? null : child2.orgChild2Name, child2: child2 == null ? null : child2.orgChild2Name,
child2ShortName: child2 == null ? null : child2.orgChild2ShortName, child2ShortName: child2 == null ? null : child2.orgChild2ShortName,
child3Id: child3 == null ? null : child3.id, child3Id: child3 == null ? null : child3.ancestorDNA,
child3DnaId: child3 == null ? null : child3.ancestorDNA,
child3: child3 == null ? null : child3.orgChild3Name, child3: child3 == null ? null : child3.orgChild3Name,
child3ShortName: child3 == null ? null : child3.orgChild3ShortName, child3ShortName: child3 == null ? null : child3.orgChild3ShortName,
child4Id: child4 == null ? null : child4.id, child4Id: child4 == null ? null : child4.ancestorDNA,
child4DnaId: child4 == null ? null : child4.ancestorDNA,
child4: child4 == null ? null : child4.orgChild4Name, child4: child4 == null ? null : child4.orgChild4Name,
child4ShortName: child4 == null ? null : child4.orgChild4ShortName, child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
node: null, node: null,