From b871bbedad6ae9e36cfcc5cd3721395d5b318a50 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Thu, 1 May 2025 13:40:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=A5=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=99=E0=B8=84?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B9=81=E0=B8=A5=E0=B9=89=E0=B8=A7?=
 =?UTF-8?q?=20=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=84=E0=B8=9B=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=97=E0=B8=B5?=
 =?UTF-8?q?=E0=B9=88=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B1=E0=B9=88=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A7=20=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=AA=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=87=E0=B8=81=E0=B8=B1=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EmployeeTempPositionController.ts         | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/controllers/EmployeeTempPositionController.ts b/src/controllers/EmployeeTempPositionController.ts
index b551fa95..b507734b 100644
--- a/src/controllers/EmployeeTempPositionController.ts
+++ b/src/controllers/EmployeeTempPositionController.ts
@@ -1941,12 +1941,30 @@ export class EmployeeTempPositionController extends Controller {
   ) {
     await new permission().PermissionCreate(request, "SYS_ORG_TEMP");
     const dataMaster = await this.employeeTempPosMasterRepository.findOne({
-      where: { id: requestBody.posMaster },
-      relations: ["positions"],
+      where: { 
+        id: requestBody.posMaster,
+        orgRevision: {
+          orgRevisionIsCurrent: true,
+          orgRevisionIsDraft: false
+        }
+      },
+      relations: ["positions", "orgRevision", "orgRoot", "orgChild1", "orgChild2", "orgChild3", "orgChild4"],
     });
     if (!dataMaster) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตำแหน่งนี้");
     }
+    let _root = dataMaster.orgRoot?.orgRootName;
+    let _child1 = dataMaster.orgChild1?.orgChild1Name;
+    let _child2 = dataMaster.orgChild2?.orgChild2Name;
+    let _child3 = dataMaster.orgChild3?.orgChild3Name;
+    let _child4 = dataMaster.orgChild4?.orgChild4Name;
+    const Org = 
+      (_child4 == null ? "" : _child4 + "\n") +
+      (_child3 == null ? "" : _child3 + "\n") +
+      (_child2 == null ? "" : _child2 + "\n") +
+      (_child1 == null ? "" : _child1 + "\n") +
+      (_root == null ? "" : _root);
+
     dataMaster.positions.forEach(async (position) => {
       if (position.id === requestBody.position) {
         position.positionIsSelected = true;
@@ -1958,6 +1976,8 @@ export class EmployeeTempPositionController extends Controller {
           profile.posLevelId = position?.posLevelId ?? _null;
           profile.posTypeId = position?.posTypeId ?? _null;
           profile.position = position?.positionName ?? _null;
+          profile.employeeOc = Org ?? _null;
+          profile.positionEmployeePositionId = position?.positionName ?? _null;
           await this.profileRepository.save(profile);
         }
       } else {