This commit is contained in:
kittapath 2025-02-14 09:58:51 +07:00
parent 408a3a7644
commit b94d4e1b93
3 changed files with 324 additions and 29 deletions

View file

@ -1213,31 +1213,31 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgRoot.ancestorDNA ?? null,
child1DnaId:
profile?.current_holders?.find(
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild3.ancestorDNA ?? null,
child2DnaId:
profile?.current_holders?.find(
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild2.ancestorDNA ?? null,
child3DnaId:
profile?.current_holders?.find(
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild3.ancestorDNA ?? null,
child4DnaId:
profile?.current_holders?.find(
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild4.ancestorDNA ?? null,
commander: fullname,
posLevel: profile.posLevel?.posLevelName ?? null,
posType: profile.posType?.posTypeName ?? null,
@ -1510,31 +1510,31 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgRoot.ancestorDNA ?? null,
child1DnaId:
profile?.current_holders?.find(
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild1.ancestorDNA ?? null,
child2DnaId:
profile?.current_holders?.find(
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild2.ancestorDNA ?? null,
child3DnaId:
profile?.current_holders?.find(
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild3.ancestorDNA ?? null,
child4DnaId:
profile?.current_holders?.find(
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild4.ancestorDNA ?? null,
commander: fullname,
posLevel: profile.posLevel?.posLevelName ?? null,
posType: profile.posType?.posTypeName ?? null,
@ -2276,7 +2276,7 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgRoot.ancestorDNA ?? null,
child1:
profile?.current_holders?.find(
(x) =>
@ -2294,7 +2294,7 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild1.ancestorDNA ?? null,
child2:
profile?.current_holders?.find(
(x) =>
@ -2312,7 +2312,7 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild2.ancestorDNA ?? null,
child3:
profile?.current_holders?.find(
(x) =>
@ -2330,7 +2330,7 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild3.ancestorDNA ?? null,
child4:
profile?.current_holders?.find(
(x) =>
@ -2348,7 +2348,7 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild4.ancestorDNA ?? null,
posNo: shortName ?? "",
};
});
@ -2643,7 +2643,7 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgRoot.ancestorDNA ?? null,
child1:
profile?.current_holders?.find(
(x) =>
@ -2661,7 +2661,7 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild1.ancestorDNA ?? null,
child2:
profile?.current_holders?.find(
(x) =>
@ -2679,7 +2679,7 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild2.ancestorDNA ?? null,
child3:
profile?.current_holders?.find(
(x) =>
@ -2697,7 +2697,7 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild3.ancestorDNA ?? null,
child4:
profile?.current_holders?.find(
(x) =>
@ -2715,7 +2715,7 @@ export class OrganizationDotnetController extends Controller {
(x) =>
x.orgRevision?.orgRevisionIsDraft == false &&
x.orgRevision?.orgRevisionIsCurrent == true,
)?.ancestorDNA ?? null,
)?.orgChild4.ancestorDNA ?? null,
posNo: shortName ?? "",
};
});