From 39a1a3bbb09631a6cc97f78f0e178ac31de2eb08 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang
 <153157069+AdisakKanthawilang@users.noreply.github.com>
Date: Mon, 3 Nov 2025 11:56:26 +0700
Subject: [PATCH] #1767 (#205)

---
 src/controllers/OrganizationController.ts | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index 909614d5..89ec4400 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -1218,6 +1218,7 @@ export class OrganizationController extends Controller {
         "orgRoot.SECTION_CODE",
         "orgRoot.JOB_CODE",
         "orgRoot.responsibility",
+        "orgRoot.ancestorDNA",
       ])
       .orderBy("orgRoot.orgRootOrder", "ASC")
       .getMany();
@@ -1246,6 +1247,7 @@ export class OrganizationController extends Controller {
               "orgChild1.SECTION_CODE",
               "orgChild1.JOB_CODE",
               "orgChild1.responsibility",
+              "orgChild1.ancestorDNA",
             ])
             .orderBy("orgChild1.orgChild1Order", "ASC")
             .getMany()
@@ -1275,6 +1277,7 @@ export class OrganizationController extends Controller {
               "orgChild2.JOB_CODE",
               "orgChild2.orgChild1Id",
               "orgChild2.responsibility",
+              "orgChild2.ancestorDNA",
             ])
             .orderBy("orgChild2.orgChild2Order", "ASC")
             .getMany()
@@ -1304,6 +1307,7 @@ export class OrganizationController extends Controller {
               "orgChild3.JOB_CODE",
               "orgChild3.orgChild2Id",
               "orgChild3.responsibility",
+              "orgChild3.ancestorDNA",
             ])
             .orderBy("orgChild3.orgChild3Order", "ASC")
             .getMany()
@@ -1333,12 +1337,13 @@ export class OrganizationController extends Controller {
               "orgChild4.JOB_CODE",
               "orgChild4.orgChild3Id",
               "orgChild4.responsibility",
+              "orgChild4.ancestorDNA",
             ])
             .orderBy("orgChild4.orgChild4Order", "ASC")
             .getMany()
         : [];
 
-    // const formattedData = orgRootData.map((orgRoot) => { //return fix
+    // const formattedData = orgRootData.map((orgRoot) => {
     const formattedData = await Promise.all(
       orgRootData.map(async (orgRoot) => {
         return {
@@ -1351,6 +1356,7 @@ export class OrganizationController extends Controller {
           orgCode: orgRoot.orgRootCode + "00",
           orgTreeRank: orgRoot.orgRootRank,
           orgTreeRankSub: orgRoot.orgRootRankSub,
+          orgRootDnaId: orgRoot.ancestorDNA,
           DEPARTMENT_CODE: orgRoot.DEPARTMENT_CODE,
           DIVISION_CODE: orgRoot.DIVISION_CODE,
           SECTION_CODE: orgRoot.SECTION_CODE,
@@ -1466,6 +1472,8 @@ export class OrganizationController extends Controller {
                 orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code,
                 orgTreeRank: orgChild1.orgChild1Rank,
                 orgTreeRankSub: orgChild1.orgChild1RankSub,
+                orgRootDnaId: orgRoot.ancestorDNA,
+                orgChild1DnaId: orgChild1.ancestorDNA,
                 DEPARTMENT_CODE: orgChild1.DEPARTMENT_CODE,
                 DIVISION_CODE: orgChild1.DIVISION_CODE,
                 SECTION_CODE: orgChild1.SECTION_CODE,
@@ -1587,6 +1595,9 @@ export class OrganizationController extends Controller {
                       orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code,
                       orgTreeRank: orgChild2.orgChild2Rank,
                       orgTreeRankSub: orgChild2.orgChild2RankSub,
+                      orgRootDnaId: orgRoot.ancestorDNA,
+                      orgChild1DnaId: orgChild1.ancestorDNA,
+                      orgChild2DnaId: orgChild2.ancestorDNA,
                       DEPARTMENT_CODE: orgChild2.DEPARTMENT_CODE,
                       DIVISION_CODE: orgChild2.DIVISION_CODE,
                       SECTION_CODE: orgChild2.SECTION_CODE,
@@ -1709,6 +1720,10 @@ export class OrganizationController extends Controller {
                             orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code,
                             orgTreeRank: orgChild3.orgChild3Rank,
                             orgTreeRankSub: orgChild3.orgChild3RankSub,
+                            orgRootDnaId: orgRoot.ancestorDNA,
+                            orgChild1DnaId: orgChild1.ancestorDNA,
+                            orgChild2DnaId: orgChild2.ancestorDNA,
+                            orgChild3DnaId: orgChild3.ancestorDNA,
                             DEPARTMENT_CODE: orgChild3.DEPARTMENT_CODE,
                             DIVISION_CODE: orgChild3.DIVISION_CODE,
                             SECTION_CODE: orgChild3.SECTION_CODE,
@@ -1831,6 +1846,11 @@ export class OrganizationController extends Controller {
                                   orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code,
                                   orgTreeRank: orgChild4.orgChild4Rank,
                                   orgTreeRankSub: orgChild4.orgChild4RankSub,
+                                  orgRootDnaId: orgRoot.ancestorDNA,
+                                  orgChild1DnaId: orgChild1.ancestorDNA,
+                                  orgChild2DnaId: orgChild2.ancestorDNA,
+                                  orgChild3DnaId: orgChild3.ancestorDNA,
+                                  orgChild4DnaId: orgChild4.ancestorDNA,
                                   DEPARTMENT_CODE: orgChild4.DEPARTMENT_CODE,
                                   DIVISION_CODE: orgChild4.DIVISION_CODE,
                                   SECTION_CODE: orgChild4.SECTION_CODE,