From 4479507ae855fba07c1a4d784729012a568cc4cd Mon Sep 17 00:00:00 2001
From: Adisak <adisak@frappet.com>
Date: Fri, 19 Dec 2025 13:58:40 +0700
Subject: [PATCH] fix brother privilage

---
 .../OrganizationDotnetController.ts           | 422 +++++++++---------
 1 file changed, 222 insertions(+), 200 deletions(-)

diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts
index 443255c9..1a45751a 100644
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@@ -237,7 +237,7 @@ export class OrganizationDotnetController extends Controller {
   ) {
     let condition = "1=1";
     let conditionParams = {};
-    if (body.role === "CHILD" || body.role === "BROTHER") {
+    if (body.role === "CHILD") {
       switch (body.node) {
         case 0:
           condition = "orgRoot.ancestorDNA = :nodeId";
@@ -259,6 +259,28 @@ export class OrganizationDotnetController extends Controller {
           break;
       }
       conditionParams = { nodeId: body.nodeId };
+    } else if (body.role === "BROTHER") {
+      switch (body.node) {
+        case 0:
+          condition = "orgRoot.ancestorDNA = :nodeId";
+          break;
+        case 1:
+          condition = "orgRoot.ancestorDNA = :nodeId";
+          break;
+        case 2:
+          condition = "orgChild1.ancestorDNA = :nodeId";
+          break;
+        case 3:
+          condition = "orgChild2.ancestorDNA = :nodeId";
+          break;
+        case 4:
+          condition = "orgChild3.ancestorDNA = :nodeId";
+          break;
+        default:
+          condition = "1=1";
+          break;
+      }
+      conditionParams = { nodeId: body.nodeId };
     } else if (body.role === "ROOT") {
       condition = "orgRoot.ancestorDNA = :nodeId";
       conditionParams = { nodeId: body.nodeId };
@@ -974,8 +996,8 @@ export class OrganizationDotnetController extends Controller {
 
     let positionLeaveName =
       profile.posType != null &&
-      profile.posLevel != null &&
-      (profile.posType.posTypeName == "บริหาร" || profile.posType.posTypeName == "อำนวยการ")
+        profile.posLevel != null &&
+        (profile.posType.posTypeName == "บริหาร" || profile.posType.posTypeName == "อำนวยการ")
         ? `${profile.posType?.posTypeName ?? ""}${profile.posLevel?.posLevelName ?? ""}`
         : profile.posLevel?.posLevelName ?? null;
     const _profileCurrent = profile?.current_holders?.find(
@@ -2567,26 +2589,26 @@ export class OrganizationDotnetController extends Controller {
         profile.current_holders.length == 0
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-              profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                null
+            profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+            null
             ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
             : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                  ?.orgChild3 != null
+              profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                ?.orgChild3 != null
               ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild2 != null
+                profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild2 != null
                 ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                      null &&
-                    profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild1 != null
+                  null &&
+                  profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild1 != null
                   ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                        null &&
-                      profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgRoot != null
+                    null &&
+                    profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgRoot != null
                     ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : null;
 
@@ -2866,26 +2888,26 @@ export class OrganizationDotnetController extends Controller {
         profile.current_holders.length == 0
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-              profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                null
+            profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+            null
             ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
             : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                  ?.orgChild3 != null
+              profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                ?.orgChild3 != null
               ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild2 != null
+                profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild2 != null
                 ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                      null &&
-                    profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild1 != null
+                  null &&
+                  profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild1 != null
                   ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                        null &&
-                      profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgRoot != null
+                    null &&
+                    profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgRoot != null
                     ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : null;
       return {
@@ -3081,26 +3103,26 @@ export class OrganizationDotnetController extends Controller {
         profile.current_holders.length == 0
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-              profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                null
+            profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+            null
             ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
             : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                  ?.orgChild3 != null
+              profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                ?.orgChild3 != null
               ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild2 != null
+                profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild2 != null
                 ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                      null &&
-                    profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild1 != null
+                  null &&
+                  profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild1 != null
                   ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                        null &&
-                      profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgRoot != null
+                    null &&
+                    profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgRoot != null
                     ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : null;
       return {
@@ -3337,7 +3359,7 @@ export class OrganizationDotnetController extends Controller {
 
     const root =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == null
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot;
 
@@ -3397,41 +3419,41 @@ export class OrganizationDotnetController extends Controller {
 
     const posMaster =
       profile.current_holders == null ||
-      profile.current_holders.length == 0 ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) == null
+        profile.current_holders.length == 0 ||
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id);
 
     const root =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == null
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot;
 
     const child1 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1;
 
     const child2 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2;
 
     const child3 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3;
 
     const child4 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4;
@@ -3570,30 +3592,30 @@ export class OrganizationDotnetController extends Controller {
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot
-                ?.orgRootName;
+              ?.orgRootName;
         const shortName =
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild3 != null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild2 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgChild1 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                       : null;
 
@@ -3698,30 +3720,30 @@ export class OrganizationDotnetController extends Controller {
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot
-                ?.orgRootName;
+              ?.orgRootName;
         const shortName =
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild3 != null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild2 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgChild1 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                       : null;
 
@@ -3905,25 +3927,25 @@ export class OrganizationDotnetController extends Controller {
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild3 != null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild2 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgChild1 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                       : null;
         const Oc =
@@ -4084,25 +4106,25 @@ export class OrganizationDotnetController extends Controller {
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName}${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild3 != null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild2 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgChild1 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                       : null;
         const Oc =
@@ -4254,25 +4276,25 @@ export class OrganizationDotnetController extends Controller {
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild3 != null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild2 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgChild1 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                       : null;
         const Oc =
@@ -4644,25 +4666,25 @@ export class OrganizationDotnetController extends Controller {
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild3 != null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild2 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgChild1 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                       : null;
         const Oc =
@@ -4810,25 +4832,25 @@ export class OrganizationDotnetController extends Controller {
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild3 != null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild2 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgChild1 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                       : null;
         const Oc =
@@ -4964,25 +4986,25 @@ export class OrganizationDotnetController extends Controller {
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild3 != null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild2 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgChild1 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                       : null;
         const Oc =
@@ -5248,25 +5270,25 @@ export class OrganizationDotnetController extends Controller {
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                    ?.orgChild3 != null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                  ?.orgChild3 != null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                      ?.orgChild2 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                        ?.orgChild1 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision?.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision?.id)?.posMasterNo}`
                       : null;
         const Oc =
@@ -5547,16 +5569,16 @@ export class OrganizationDotnetController extends Controller {
         currentAddress:
           profile && profile.currentAddress
             ? profile.currentAddress +
-              (profile.currentSubDistrict && profile.currentSubDistrict.name
-                ? " ตำบล/แขวง " + profile.currentSubDistrict.name
-                : "") +
-              (profile.currentDistrict && profile.currentDistrict.name
-                ? " อำเภอ/เขต " + profile.currentDistrict.name
-                : "") +
-              (profile.currentProvince && profile.currentProvince.name
-                ? " จังหวัด " + profile.currentProvince.name
-                : "") +
-              profile.currentZipCode
+            (profile.currentSubDistrict && profile.currentSubDistrict.name
+              ? " ตำบล/แขวง " + profile.currentSubDistrict.name
+              : "") +
+            (profile.currentDistrict && profile.currentDistrict.name
+              ? " อำเภอ/เขต " + profile.currentDistrict.name
+              : "") +
+            (profile.currentProvince && profile.currentProvince.name
+              ? " จังหวัด " + profile.currentProvince.name
+              : "") +
+            profile.currentZipCode
             : "-",
         oc: oc ?? "-",
         root:
@@ -5592,26 +5614,26 @@ export class OrganizationDotnetController extends Controller {
         positions:
           _position && _position.length > 0
             ? _position.slice(0, -1).map((x: any, idx: number) => ({
-                positionName: x.positionName,
-                dateStart: x.commandDateAffect ?? null,
-                dateEnd: _position[idx + 1]?.commandDateAffect ?? null,
-                positionType: x.positionType,
-                positionLevel: x.positionLevel,
-                orgRoot: x.orgRoot,
-                orgChild1: x.orgChild1,
-                orgChild2: x.orgChild2,
-                orgChild3: x.orgChild3,
-                orgChild4: x.orgChild4,
-              }))
+              positionName: x.positionName,
+              dateStart: x.commandDateAffect ?? null,
+              dateEnd: _position[idx + 1]?.commandDateAffect ?? null,
+              positionType: x.positionType,
+              positionLevel: x.positionLevel,
+              orgRoot: x.orgRoot,
+              orgChild1: x.orgChild1,
+              orgChild2: x.orgChild2,
+              orgChild3: x.orgChild3,
+              orgChild4: x.orgChild4,
+            }))
             : [],
         educations:
           profile.profileEducations && profile.profileEducations.length > 0
             ? profile.profileEducations.map((x) => ({
-                educationLevel: x.educationLevel,
-                institute: x.institute ?? "-",
-                country: x.country ?? "-",
-                finishDate: x.finishDate,
-              }))
+              educationLevel: x.educationLevel,
+              institute: x.institute ?? "-",
+              country: x.country ?? "-",
+              finishDate: x.finishDate,
+            }))
             : [],
       };
       return new HttpSuccess(mapEmpProfile);
@@ -5661,16 +5683,16 @@ export class OrganizationDotnetController extends Controller {
       currentAddress:
         profile && profile.currentAddress
           ? profile.currentAddress +
-            (profile.currentSubDistrict && profile.currentSubDistrict.name
-              ? " ตำบล/แขวง " + profile.currentSubDistrict.name
-              : "") +
-            (profile.currentDistrict && profile.currentDistrict.name
-              ? " อำเภอ/เขต " + profile.currentDistrict.name
-              : "") +
-            (profile.currentProvince && profile.currentProvince.name
-              ? " จังหวัด " + profile.currentProvince.name
-              : "") +
-            profile.currentZipCode
+          (profile.currentSubDistrict && profile.currentSubDistrict.name
+            ? " ตำบล/แขวง " + profile.currentSubDistrict.name
+            : "") +
+          (profile.currentDistrict && profile.currentDistrict.name
+            ? " อำเภอ/เขต " + profile.currentDistrict.name
+            : "") +
+          (profile.currentProvince && profile.currentProvince.name
+            ? " จังหวัด " + profile.currentProvince.name
+            : "") +
+          profile.currentZipCode
           : "-",
       oc: oc ?? "-",
       root:
@@ -5706,26 +5728,26 @@ export class OrganizationDotnetController extends Controller {
       positions:
         _position && _position.length > 0
           ? _position.slice(0, -1).map((x: any, idx: number) => ({
-              positionName: x.positionName,
-              dateStart: x.commandDateAffect ?? null,
-              dateEnd: _position[idx + 1]?.commandDateAffect ?? null,
-              positionType: x.positionType,
-              positionLevel: x.positionLevel,
-              orgRoot: x.orgRoot,
-              orgChild1: x.orgChild1,
-              orgChild2: x.orgChild2,
-              orgChild3: x.orgChild3,
-              orgChild4: x.orgChild4,
-            }))
+            positionName: x.positionName,
+            dateStart: x.commandDateAffect ?? null,
+            dateEnd: _position[idx + 1]?.commandDateAffect ?? null,
+            positionType: x.positionType,
+            positionLevel: x.positionLevel,
+            orgRoot: x.orgRoot,
+            orgChild1: x.orgChild1,
+            orgChild2: x.orgChild2,
+            orgChild3: x.orgChild3,
+            orgChild4: x.orgChild4,
+          }))
           : [],
       educations:
         profile.profileEducations && profile.profileEducations.length > 0
           ? profile.profileEducations.map((x) => ({
-              educationLevel: x.educationLevel,
-              institute: x.institute ?? "-",
-              country: x.country ?? "-",
-              finishDate: x.finishDate,
-            }))
+            educationLevel: x.educationLevel,
+            institute: x.institute ?? "-",
+            country: x.country ?? "-",
+            finishDate: x.finishDate,
+          }))
           : [],
     };
     return new HttpSuccess(mapProfile);