From c810f75abd26d111c778fa5ea21d88a1dbff379e Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Fri, 16 Aug 2024 11:22:16 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20API=20?=
 =?UTF-8?q?=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2=E0=B8=84=E0=B8=99?=
 =?UTF-8?q?=E0=B9=83=E0=B8=99=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=88=E0=B8=B2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=97=E0=B8=B5=E0=B9=88=20?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=87=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99/=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3=20#88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 692783b4..c8e6a997 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -2556,13 +2556,15 @@ export class ProfileController extends Controller {
   async listProfile(
     @Query("page") page: number = 1,
     @Query("pageSize") pageSize: number = 10,
-    @Query() searchField?: "firstName" | "lastName" | "fullName" | "citizenId" | "position",
+    @Query() searchField?: "firstName" | "lastName" | "fullName" | "citizenId" | "position" | "posNo",
     @Query() searchKeyword: string = "",
     @Query() posType?: string,
     @Query() posLevel?: string,
     @Query() yearLeave?: number,
     @Query() isProbation?: boolean,
     @Query() isRetire?: boolean,
+    @Query() node?: number,
+    @Query() nodeId?: string,
   ) {
     let queryLike =
       "CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword";
@@ -2570,6 +2572,27 @@ export class ProfileController extends Controller {
       queryLike = "profile.citizenId LIKE :keyword";
     } else if (searchField == "position") {
       queryLike = "profile.position LIKE :keyword";
+    } else if (searchField == "posNo") {
+      queryLike = `CONCAT(
+        IFNULL(orgChild4.orgChild4ShortName, ''),
+        IFNULL(orgChild3.orgChild3ShortName, ''),
+        IFNULL(orgChild2.orgChild2ShortName, ''),
+        IFNULL(orgChild1.orgChild1ShortName, ''),
+        IFNULL(orgRoot.orgRootShortName, ''),
+        IFNULL(current_holders.posMasterNo , '')
+      ) LIKE :keyword`;
+    }
+    let nodeCondition = "1=1";
+    if (node === 0 && nodeId) {
+      nodeCondition = "current_holders.orgRootId = :nodeId";
+    } else if (node === 1 && nodeId) {
+      nodeCondition = "current_holders.orgChild1Id = :nodeId";
+    } else if (node === 2 && nodeId) {
+      nodeCondition = "current_holders.orgChild2Id = :nodeId";
+    } else if (node === 3 && nodeId) {
+      nodeCondition = "current_holders.orgChild3Id = :nodeId";
+    } else if (node === 4 && nodeId) {
+      nodeCondition = "current_holders.orgChild4Id = :nodeId";
     }
     const [record, total] = await this.profileRepo
       .createQueryBuilder("profile")
@@ -2619,9 +2642,13 @@ export class ProfileController extends Controller {
           keyword: `%${searchKeyword}%`,
         },
       )
+      .andWhere(nodeCondition, {
+        nodeId: nodeId,
+      }) 
       .skip((page - 1) * pageSize)
       .take(pageSize)
       .getManyAndCount();
+    
     const findRevision = await this.orgRevisionRepo.findOne({
       where: { orgRevisionIsCurrent: true },
     });