From a7e12be51f20765e3d721f9e355b2c520d34249f Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Mon, 10 Feb 2025 17:32:19 +0700
Subject: [PATCH] =?UTF-8?q?fix=20issue=20#1175=20(=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=95=E0=B8=B1=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=A2=E0=B9=88=E0=B8=AD=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=87=20=E0=B9=84=E0=B8=A1=E0=B9=88?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=87=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=AB=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=88=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=81=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B1=E0=B9=88=E0=B8=87)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/CommandController.ts | 34 ++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 438cbf37..ac850cb2 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -4707,7 +4707,37 @@ export class CommandController extends Controller {
         if (!profile) {
           throw new HttpError(HttpStatus.BAD_REQUEST, "ไม่พบ profile ดังกล่าว");
         }
-
+        const _posMaster = await this.employeePosMasterRepository.findOne({
+          where: {
+            orgRevision: {
+              orgRevisionIsCurrent: true,
+              orgRevisionIsDraft: false,
+            },
+            current_holderId: profile.id,
+          },
+          order: { createdAt: "DESC" },
+          relations: {
+            orgRoot: true,
+            orgChild1: true,
+            orgChild2: true,
+            orgChild3: true,
+            orgChild4: true,
+          },
+        });
+        let orgShortName = "";
+        if (_posMaster != null) {
+          if (_posMaster.orgChild1Id === null) {
+            orgShortName = _posMaster.orgRoot?.orgRootShortName;
+          } else if (_posMaster.orgChild2Id === null) {
+            orgShortName = _posMaster.orgChild1?.orgChild1ShortName;
+          } else if (_posMaster.orgChild3Id === null) {
+            orgShortName = _posMaster.orgChild2?.orgChild2ShortName;
+          } else if (_posMaster.orgChild4Id === null) {
+            orgShortName = _posMaster.orgChild3?.orgChild3ShortName;
+          } else {
+            orgShortName = _posMaster.orgChild4?.orgChild4ShortName;
+          }
+        }
         const dest_item = await this.salaryRepo.findOne({
           where: { profileEmployeeId: item.refId },
           order: { order: "DESC" },
@@ -4723,7 +4753,7 @@ export class CommandController extends Controller {
           commandId: item.commandId,
           positionSalaryAmount: item.positionSalaryAmount,
           mouthSalaryAmount: item.mouthSalaryAmount,
-          posNo: profile.posMasterNoTemp,
+          posNo: `${orgShortName ?? ""} ${profile.posMasterNoTemp ?? ""}`,
           position: profile.positionTemp,
           positionType: profile.posTypeNameTemp,
           positionLevel: profile.posLevelNameTemp,