From 684ab042f914f6a7e7c158504b5d329baed13a69 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Wed, 7 May 2025 14:03:39 +0700
Subject: [PATCH] fix dotnet/citicenId

---
 .../OrganizationDotnetController.ts           | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts
index 46665d7b..39d332a1 100644
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@@ -2012,6 +2012,31 @@ export class OrganizationDotnetController extends Controller {
               x.orgRevision?.orgRevisionIsDraft == false &&
               x.orgRevision?.orgRevisionIsCurrent == true,
           )?.orgChild4Id ?? null,
+        rootDnaId: profile?.current_holders?.find(
+          (x) =>
+            x.orgRevision?.orgRevisionIsDraft == false &&
+            x.orgRevision?.orgRevisionIsCurrent == true,
+        )?.orgRoot?.ancestorDNA ?? null,
+        child1DnaId: profile?.current_holders?.find(
+          (x) =>
+            x.orgRevision?.orgRevisionIsDraft == false &&
+            x.orgRevision?.orgRevisionIsCurrent == true,
+        )?.orgChild1?.ancestorDNA ?? null,
+        child2DnaId: profile?.current_holders?.find(
+          (x) =>
+            x.orgRevision?.orgRevisionIsDraft == false &&
+            x.orgRevision?.orgRevisionIsCurrent == true,
+        )?.orgChild2?.ancestorDNA ?? null,
+        child3DnaId: profile?.current_holders?.find(
+          (x) =>
+            x.orgRevision?.orgRevisionIsDraft == false &&
+            x.orgRevision?.orgRevisionIsCurrent == true,
+        )?.orgChild3?.ancestorDNA ?? null,
+        child4DnaId: profile?.current_holders?.find(
+          (x) =>
+            x.orgRevision?.orgRevisionIsDraft == false &&
+            x.orgRevision?.orgRevisionIsCurrent == true,
+        )?.orgChild4?.ancestorDNA ?? null,
         commander: fullname,
         posLevel: profile.posLevel?.posLevelName ?? null,
         posType: profile.posType?.posTypeName ?? null,
@@ -2279,6 +2304,31 @@ export class OrganizationDotnetController extends Controller {
             x.orgRevision?.orgRevisionIsDraft == false &&
             x.orgRevision?.orgRevisionIsCurrent == true,
         )?.orgChild4Id ?? null,
+      rootDnaId: profile?.current_holders?.find(
+        (x) =>
+          x.orgRevision?.orgRevisionIsDraft == false &&
+          x.orgRevision?.orgRevisionIsCurrent == true,
+      )?.orgRoot?.ancestorDNA ?? null,
+      child1DnaId: profile?.current_holders?.find(
+        (x) =>
+          x.orgRevision?.orgRevisionIsDraft == false &&
+          x.orgRevision?.orgRevisionIsCurrent == true,
+      )?.orgChild1?.ancestorDNA ?? null,
+      child2DnaId: profile?.current_holders?.find(
+        (x) =>
+          x.orgRevision?.orgRevisionIsDraft == false &&
+          x.orgRevision?.orgRevisionIsCurrent == true,
+      )?.orgChild2?.ancestorDNA ?? null,
+      child3DnaId: profile?.current_holders?.find(
+        (x) =>
+          x.orgRevision?.orgRevisionIsDraft == false &&
+          x.orgRevision?.orgRevisionIsCurrent == true,
+      )?.orgChild3?.ancestorDNA ?? null,
+      child4DnaId: profile?.current_holders?.find(
+        (x) =>
+          x.orgRevision?.orgRevisionIsDraft == false &&
+          x.orgRevision?.orgRevisionIsCurrent == true,
+      )?.orgChild4?.ancestorDNA ?? null,
       commander: fullname,
       posLevel: profile.posLevel?.posLevelName ?? null,
       posType: profile.posType?.posTypeName ?? null,