From 0f89aa4a9235eff1c7284d5b33d8e6dfc72e55d7 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Wed, 30 Jul 2025 14:06:22 +0700
Subject: [PATCH] shortName

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

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 151472c8..fd43d0b1 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -6151,12 +6151,16 @@ export class ProfileController extends Controller {
         "orgRoot.orgRootShortName",
         "orgRoot.orgRootOrder",
         "orgChild1.orgChild1Name",
+        "orgChild1.orgChild1ShortName",
         "orgChild1.orgChild1Order",
         "orgChild2.orgChild2Name",
+        "orgChild2.orgChild2ShortName",
         "orgChild2.orgChild2Order",
         "orgChild3.orgChild3Name",
+        "orgChild3.orgChild3ShortName",
         "orgChild3.orgChild3Order",
         "orgChild4.orgChild4Name",
+        "orgChild4.orgChild4ShortName",
         "orgChild4.orgChild4Order",
       ])
       .where(node && nodeId ? "current_holders.orgRevisionId = :orgRevisionId" : "1=1", {
@@ -6253,6 +6257,21 @@ export class ProfileController extends Controller {
       ]
         .filter(Boolean)
         .join("\n");
+        
+      const shortName =
+        !holder
+          ? null
+          : holder.orgChild4 != null
+            ? `${holder.orgChild4.orgChild4ShortName} ${holder.posMasterNo}`
+            : holder.orgChild3 != null
+              ? `${holder.orgChild3.orgChild3ShortName} ${holder.posMasterNo}`
+              : holder.orgChild2 != null
+                ? `${holder.orgChild2.orgChild2ShortName} ${holder.posMasterNo}`
+                : holder.orgChild1 != null
+                  ? `${holder.orgChild1.orgChild1ShortName} ${holder.posMasterNo}`
+                  : holder.orgRoot != null
+                    ? `${holder.orgRoot.orgRootShortName} ${holder.posMasterNo}`
+                    : null;
 
       return {
         id: _data.id,
@@ -6269,7 +6288,7 @@ export class ProfileController extends Controller {
         posLevelId: _data.posLevel?.id ?? null,
         posTypeId: _data.posType?.id ?? null,
         position: _data.position,
-        posNo: holder?.posMasterNo ?? null,
+        posNo: shortName ?? null,
         rootId: holder?.orgRoot?.id ?? null,
         root: holder?.orgRoot?.orgRootName ?? null,
         orgRootShortName: holder?.orgRoot?.orgRootShortName ?? null,