From 05c38b8d8e06d78bc2d7c2ada0846d10ce74b55e Mon Sep 17 00:00:00 2001
From: Harid Promsri <52228846+Harid-999@users.noreply.github.com>
Date: Mon, 27 Oct 2025 16:40:15 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=95=E0=B8=B3?=
 =?UTF-8?q?=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87=E0=B9=81=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=94=E0=B8=87=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=95=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=87=E0=B8=81=E0=B8=B1=E0=B8=9A=E0=B8=97=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=20#1899=20(#204)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: harid <harid_pr61@live.rmutl.com>
---
 src/controllers/ProfileController.ts         | 28 +++++++++++++-------
 src/controllers/ProfileEmployeeController.ts | 13 ++++++---
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index aebd8fa6..e32494c0 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -7365,40 +7365,45 @@ export class ProfileController extends Controller {
         nodeDnaId: null,
         type: profile.employeeClass,
         salary: profile.amount,
-        posNo:
-          root?.orgRootShortName && posMaster?.posMasterNo
-            ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
-            : "",
+        posNo: null
+          // root?.orgRootShortName && posMaster?.posMasterNo
+          //   ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
+          //   : "",
       };
       if (_profile.child4Id != null) {
         _profile.node = 4;
         _profile.nodeId = _profile.child4Id;
         _profile.nodeDnaId = _profile.child4DnaId;
         _profile.nodeShortName = _profile.child4ShortName;
+        _profile.posNo = `${_profile.child4ShortName} ${_profile.posMasterNo}`;
       } else if (_profile.child3Id != null) {
         _profile.node = 3;
         _profile.nodeId = _profile.child3Id;
         _profile.nodeDnaId = _profile.child3DnaId;
         _profile.nodeShortName = _profile.child3ShortName;
+        _profile.posNo = `${_profile.child3ShortName} ${_profile.posMasterNo}`;
       } else if (_profile.child2Id != null) {
         _profile.node = 2;
         _profile.nodeId = _profile.child2Id;
         _profile.nodeDnaId = _profile.child2DnaId;
         _profile.nodeShortName = _profile.child2ShortName;
+        _profile.posNo = `${_profile.child2ShortName} ${_profile.posMasterNo}`;
       } else if (_profile.child1Id != null) {
         _profile.node = 1;
         _profile.nodeId = _profile.child1Id;
         _profile.nodeDnaId = _profile.child1DnaId;
         _profile.nodeShortName = _profile.child1ShortName;
+        _profile.posNo = `${_profile.child1ShortName} ${_profile.posMasterNo}`;
       } else if (_profile.rootId != null) {
         _profile.node = 0;
         _profile.nodeId = _profile.rootId;
         _profile.nodeDnaId = _profile.rootDnaId;
         _profile.nodeShortName = _profile.rootShortName;
+        _profile.posNo = `${_profile.rootShortName} ${_profile.posMasterNo}`;
       }
       return new HttpSuccess(_profile);
     }
-
+    // ขรก.
     let orgRevisionPublish: any = await this.orgRevisionRepo
       .createQueryBuilder("orgRevision")
       .where("orgRevision.orgRevisionIsDraft = false")
@@ -7529,10 +7534,10 @@ export class ProfileController extends Controller {
       nodeDnaId: null,
       salary: profile ? profile.amount : null,
       amountSpecial: profile ? profile.amountSpecial : null,
-      posNo:
-        root?.orgRootShortName && posMaster?.posMasterNo
-          ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
-          : "",
+      posNo: null
+        // root?.orgRootShortName && posMaster?.posMasterNo
+        //   ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
+        //   : "",
     };
 
     if (_profile.child4Id != null) {
@@ -7540,26 +7545,31 @@ export class ProfileController extends Controller {
       _profile.nodeId = _profile.child4Id;
       _profile.nodeDnaId = _profile.child4DnaId;
       _profile.nodeShortName = _profile.child4ShortName;
+      _profile.posNo = `${_profile.child4ShortName} ${posMaster?.posMasterNo}`;
     } else if (_profile.child3Id != null) {
       _profile.node = 3;
       _profile.nodeId = _profile.child3Id;
       _profile.nodeDnaId = _profile.child3DnaId;
       _profile.nodeShortName = _profile.child3ShortName;
+      _profile.posNo = `${_profile.child3ShortName} ${posMaster?.posMasterNo}`;
     } else if (_profile.child2Id != null) {
       _profile.node = 2;
       _profile.nodeId = _profile.child2Id;
       _profile.nodeDnaId = _profile.child2DnaId;
       _profile.nodeShortName = _profile.child2ShortName;
+      _profile.posNo = `${_profile.child2ShortName} ${posMaster?.posMasterNo}`;
     } else if (_profile.child1Id != null) {
       _profile.node = 1;
       _profile.nodeId = _profile.child1Id;
       _profile.nodeDnaId = _profile.child1DnaId;
       _profile.nodeShortName = _profile.child1ShortName;
+      _profile.posNo = `${_profile.child1ShortName} ${posMaster?.posMasterNo}`;
     } else if (_profile.rootId != null) {
       _profile.node = 0;
       _profile.nodeId = _profile.rootId;
       _profile.nodeDnaId = _profile.rootDnaId;
       _profile.nodeShortName = _profile.rootShortName;
+      _profile.posNo = `${_profile.rootShortName} ${posMaster?.posMasterNo}`;
     }
     return new HttpSuccess(_profile);
   }
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index 3ce5a3e0..dad205a4 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -3588,36 +3588,41 @@ export class ProfileEmployeeController extends Controller {
       nodeDnaId: null,
       salary: profile ? profile.amount : null,
       amountSpecial: profile ? profile.amountSpecial : null,
-      posNo:
-        root?.orgRootShortName && posMaster?.posMasterNo
-          ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
-          : "",
+      posNo: null
+        // root?.orgRootShortName && posMaster?.posMasterNo
+        //   ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
+        //   : "",
     };
     if (_profile.child4Id != null) {
       _profile.node = 4;
       _profile.nodeId = _profile.child4Id;
       _profile.nodeDnaId = _profile.child4DnaId;
       _profile.nodeShortName = _profile.child4ShortName;
+      _profile.posNo = `${_profile.child4ShortName} ${_profile.posMasterNo}`;
     } else if (_profile.child3Id != null) {
       _profile.node = 3;
       _profile.nodeId = _profile.child3Id;
       _profile.nodeDnaId = _profile.child3DnaId;
       _profile.nodeShortName = _profile.child3ShortName;
+      _profile.posNo = `${_profile.child3ShortName} ${_profile.posMasterNo}`;
     } else if (_profile.child2Id != null) {
       _profile.node = 2;
       _profile.nodeId = _profile.child2Id;
       _profile.nodeDnaId = _profile.child2DnaId;
       _profile.nodeShortName = _profile.child2ShortName;
+      _profile.posNo = `${_profile.child2ShortName} ${_profile.posMasterNo}`;
     } else if (_profile.child1Id != null) {
       _profile.node = 1;
       _profile.nodeId = _profile.child1Id;
       _profile.nodeDnaId = _profile.child1DnaId;
       _profile.nodeShortName = _profile.child1ShortName;
+      _profile.posNo = `${_profile.child1ShortName} ${_profile.posMasterNo}`;
     } else if (_profile.rootId != null) {
       _profile.node = 0;
       _profile.nodeId = _profile.rootId;
       _profile.nodeDnaId = _profile.rootDnaId;
       _profile.nodeShortName = _profile.rootShortName;
+      _profile.posNo = `${_profile.rootShortName} ${_profile.posMasterNo}`;
     }
     return new HttpSuccess(_profile);
   }