From 9cb914e07678cf27eb729d1c9825afd11ffc0d58 Mon Sep 17 00:00:00 2001
From: mamoss <>
Date: Tue, 8 Apr 2025 15:10:28 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=20=E0=B8=81=E0=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ReportController.ts   | 30 ++++------------
 src/controllers/WorkflowController.ts | 51 +++++++++++++++++++++++++--
 2 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index dbbf0df3..1cf3256f 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -834,10 +834,7 @@ export class ReportController extends Controller {
                     node.posMasterNo == null
                       ? ""
                       : Extension.ToThaiNumber(node.posMasterNo.toString()),
-                  posExecutive:
-                    node.posExecutive == _node.posExecutive
-                      ? ""
-                      : Extension.ToThaiNumber(node.posExecutive.toString()),
+                  posExecutive: Extension.ToThaiNumber(node.posExecutive.toString()),
                   positionName: Extension.ToThaiNumber(node.positionName.toString()),
                   posType: Extension.ToThaiNumber(node.posType.toString()),
                   posLevel: Extension.ToThaiNumber(node.posLevel.toString()),
@@ -945,10 +942,7 @@ export class ReportController extends Controller {
                       node.posMasterNo == null
                         ? ""
                         : Extension.ToThaiNumber(node.posMasterNo.toString()),
-                    posExecutive:
-                      node.posExecutive == _node.posExecutive
-                        ? ""
-                        : Extension.ToThaiNumber(node.posExecutive.toString()),
+                    posExecutive: Extension.ToThaiNumber(node.posExecutive.toString()),
                     positionName: Extension.ToThaiNumber(node.positionName.toString()),
                     posType: Extension.ToThaiNumber(node.posType.toString()),
                     posLevel: Extension.ToThaiNumber(node.posLevel.toString()),
@@ -1053,10 +1047,7 @@ export class ReportController extends Controller {
                         node.posMasterNo == null
                           ? ""
                           : Extension.ToThaiNumber(node.posMasterNo.toString()),
-                      posExecutive:
-                        node.posExecutive == _node.posExecutive
-                          ? ""
-                          : Extension.ToThaiNumber(node.posExecutive.toString()),
+                      posExecutive: Extension.ToThaiNumber(node.posExecutive.toString()),
                       positionName: Extension.ToThaiNumber(node.positionName.toString()),
                       posType: Extension.ToThaiNumber(node.posType.toString()),
                       posLevel: Extension.ToThaiNumber(node.posLevel.toString()),
@@ -1164,10 +1155,7 @@ export class ReportController extends Controller {
                           node.posMasterNo == null
                             ? ""
                             : Extension.ToThaiNumber(node.posMasterNo.toString()),
-                        posExecutive:
-                          node.posExecutive == _node.posExecutive
-                            ? ""
-                            : Extension.ToThaiNumber(node.posExecutive.toString()),
+                        posExecutive: Extension.ToThaiNumber(node.posExecutive.toString()),
                         positionName: Extension.ToThaiNumber(node.positionName.toString()),
                         posType: Extension.ToThaiNumber(node.posType.toString()),
                         posLevel: Extension.ToThaiNumber(node.posLevel.toString()),
@@ -1273,14 +1261,8 @@ export class ReportController extends Controller {
                           node.posMasterNo == null
                             ? ""
                             : Extension.ToThaiNumber(node.posMasterNo.toString()),
-                        posExecutive:
-                          node.posExecutive == _node.posExecutive
-                            ? ""
-                            : Extension.ToThaiNumber(node.posExecutive.toString()),
-                        positionName:
-                          node.positionName == null
-                            ? ""
-                            : Extension.ToThaiNumber(node.positionName.toString()),
+                        posExecutive: Extension.ToThaiNumber(node.posExecutive.toString()),
+                        positionName: Extension.ToThaiNumber(node.positionName.toString()),
                         posType: Extension.ToThaiNumber(node.posType.toString()),
                         posLevel: Extension.ToThaiNumber(node.posLevel.toString()),
                         reason: Extension.ToThaiNumber(node.reason.toString()),
diff --git a/src/controllers/WorkflowController.ts b/src/controllers/WorkflowController.ts
index a8dac61d..e907c703 100644
--- a/src/controllers/WorkflowController.ts
+++ b/src/controllers/WorkflowController.ts
@@ -1203,9 +1203,9 @@ export class WorkflowController extends Controller {
   }
 
   /**
-   * API เช็ค สกจ
+   * API หาหัวหน้า
    *
-   * @summary เช็ค สกจ
+   * @summary หาหัวหน้า
    *
    */
   @Post("find/director")
@@ -1246,4 +1246,51 @@ export class WorkflowController extends Controller {
     }));
     return new HttpSuccess(data);
   }
+
+  /**
+   * API หา กจ ตามระบบ
+   *
+   * @summary หา กจ ตามระบบ
+   *
+   */
+  @Post("find/director/{system}")
+  async getProfileDirectorByProfileIdSystem(
+    @Request() req: RequestWithUser,
+    @Path() system: string,
+    @Body()
+    body: {
+      refId: string[];
+    },
+  ) {
+    const _posMaster = await this.posMasterRepo.find({
+      where: {
+        orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true },
+        current_holderId: In(body.refId),
+      },
+      select: ["orgRootId", "orgChild1Id", "orgChild2Id", "orgChild3Id", "orgChild4Id"],
+    });
+    const _data: any = _posMaster.map((x) => ({
+      orgRootId: x.orgRootId,
+      orgChild1Id: x.orgChild1Id,
+      orgChild2Id: x.orgChild2Id,
+      orgChild3Id: x.orgChild3Id,
+      orgChild4Id: x.orgChild4Id,
+      // isDirector: true,
+      current_holder: Not(IsNull()),
+      posMasterAssigns: { assignId: system.trim().toUpperCase() },
+    }));
+    const posMaster = await this.posMasterRepo.find({
+      where: _data,
+      relations: ["current_holder"],
+    });
+
+    const data = posMaster.map((x) => ({
+      id: x.current_holder.id,
+      citizenId: x.current_holder.citizenId,
+      prefix: x.current_holder.prefix,
+      firstName: x.current_holder.firstName,
+      lastName: x.current_holder.lastName,
+    }));
+    return new HttpSuccess(data);
+  }
 }