From bbc6a5e6a94407136f28ec5b8d52e9e75c75a942 Mon Sep 17 00:00:00 2001
From: harid <harid_pr61@live.rmutl.com>
Date: Mon, 22 Jun 2026 10:06:59 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=84?=
 =?UTF-8?q?=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2=20labelName=20#2573?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/OrganizationController.ts | 78 +++++++++++++++++++++--
 1 file changed, 74 insertions(+), 4 deletions(-)

diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index 55f5ac93..8358313b 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -1441,7 +1441,14 @@ export class OrganizationController extends Controller {
                 orgRoot.orgRootCode +
                 orgChild1.orgChild1Code +
                 " " +
-                orgChild1.orgChild1ShortName,
+                orgChild1.orgChild1ShortName +
+                "/" +
+                orgRoot.orgRootName +
+                " " +
+                orgRoot.orgRootCode +
+                "00" +
+                " " +
+                orgRoot.orgRootShortName,
               // totalPosition: child1Counts.totalPosition,
               // totalPositionCurrentUse: child1Counts.totalPositionCurrentUse,
               // totalPositionCurrentVacant: child1Counts.totalPositionCurrentVacant,
@@ -1491,7 +1498,21 @@ export class OrganizationController extends Controller {
                       orgRoot.orgRootCode +
                       orgChild2.orgChild2Code +
                       " " +
-                      orgChild2.orgChild2ShortName,
+                      orgChild2.orgChild2ShortName +
+                      "/" +
+                      orgChild1.orgChild1Name +
+                      " " +
+                      orgRoot.orgRootCode +
+                      orgChild1.orgChild1Code +
+                      " " +
+                      orgChild1.orgChild1ShortName +
+                      "/" +
+                      orgRoot.orgRootName +
+                      " " +
+                      orgRoot.orgRootCode +
+                      "00" +
+                      " " +
+                      orgRoot.orgRootShortName,
                     // totalPosition: child2Counts.totalPosition,
                     // totalPositionCurrentUse: child2Counts.totalPositionCurrentUse,
                     // totalPositionCurrentVacant: child2Counts.totalPositionCurrentVacant,
@@ -1542,7 +1563,28 @@ export class OrganizationController extends Controller {
                             orgRoot.orgRootCode +
                             orgChild3.orgChild3Code +
                             " " +
-                            orgChild3.orgChild3ShortName,
+                            orgChild3.orgChild3ShortName +
+                            "/" +
+                            orgChild2.orgChild2Name +
+                            " " +
+                            orgRoot.orgRootCode +
+                            orgChild2.orgChild2Code +
+                            " " +
+                            orgChild2.orgChild2ShortName +
+                            "/" +
+                            orgChild1.orgChild1Name +
+                            " " +
+                            orgRoot.orgRootCode +
+                            orgChild1.orgChild1Code +
+                            " " +
+                            orgChild1.orgChild1ShortName +
+                            "/" +
+                            orgRoot.orgRootName +
+                            " " +
+                            orgRoot.orgRootCode +
+                            "00" +
+                            " " +
+                            orgRoot.orgRootShortName,
                           // totalPosition: child3Counts.totalPosition,
                           // totalPositionCurrentUse: child3Counts.totalPositionCurrentUse,
                           // totalPositionCurrentVacant: child3Counts.totalPositionCurrentVacant,
@@ -1595,7 +1637,35 @@ export class OrganizationController extends Controller {
                                   orgRoot.orgRootCode +
                                   orgChild4.orgChild4Code +
                                   " " +
-                                  orgChild4.orgChild4ShortName,
+                                  orgChild4.orgChild4ShortName +
+                                  "/" +
+                                  orgChild3.orgChild3Name +
+                                  " " +
+                                  orgRoot.orgRootCode +
+                                  orgChild3.orgChild3Code +
+                                  " " +
+                                  orgChild3.orgChild3ShortName +
+                                  "/" +
+                                  orgChild2.orgChild2Name +
+                                  " " +
+                                  orgRoot.orgRootCode +
+                                  orgChild2.orgChild2Code +
+                                  " " +
+                                  orgChild2.orgChild2ShortName +
+                                  "/" +
+                                  orgChild1.orgChild1Name +
+                                  " " +
+                                  orgRoot.orgRootCode +
+                                  orgChild1.orgChild1Code +
+                                  " " +
+                                  orgChild1.orgChild1ShortName +
+                                  "/" +
+                                  orgRoot.orgRootName +
+                                  " " +
+                                  orgRoot.orgRootCode +
+                                  "00" +
+                                  " " +
+                                  orgRoot.orgRootShortName,
                                 // totalPosition: child4Counts.totalPosition,
                                 // totalPositionCurrentUse: child4Counts.totalPositionCurrentUse,
                                 // totalPositionCurrentVacant: child4Counts.totalPositionCurrentVacant,