From ac36b37612e29f3aba9aeb83784eab52a8696cd3 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Tue, 20 Feb 2024 13:51:05 +0700
Subject: [PATCH] update query master list

---
 src/controllers/PositionController.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index 2cafa7d1..8f97fcce 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -36,7 +36,7 @@ import { Position } from "../entities/Position";
 import { Profile } from "../entities/Profile";
 @Route("api/v1/org/pos")
 @Tags("Position")
-@Security("bearerAuth")
+// @Security("bearerAuth")
 @Response(
   HttpStatusCode.INTERNAL_SERVER_ERROR,
   "เกิดข้อผิดพลาด ไม่สามารถแสดงรายการได้ กรุณาลองใหม่ในภายหลัง",
@@ -850,6 +850,7 @@ export class PositionController extends Controller {
       let typeCondition: any = {};
       let checkChildConditions: any = {};
       let keywordAsInt: any;
+      let searchShortName = "";
 
       if (body.type === 0) {
         typeCondition = {
@@ -859,6 +860,9 @@ export class PositionController extends Controller {
           checkChildConditions = {
             orgChild1Id: IsNull(),
           };
+          searchShortName = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
+        } else {
+          searchShortName = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%' or CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%' or CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%' or CONCAT(orgChild3.orgChild3ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%' or CONCAT(orgChild4.orgChild4ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
         }
       } else if (body.type === 1) {
         typeCondition = {
@@ -868,6 +872,9 @@ export class PositionController extends Controller {
           checkChildConditions = {
             orgChild2Id: IsNull(),
           };
+          searchShortName = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
+        } else {
+          searchShortName = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%' or CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%' or CONCAT(orgChild3.orgChild3ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%' or CONCAT(orgChild4.orgChild4ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
         }
       } else if (body.type === 2) {
         typeCondition = {
@@ -877,6 +884,9 @@ export class PositionController extends Controller {
           checkChildConditions = {
             orgChild3Id: IsNull(),
           };
+          searchShortName = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
+        } else {
+          searchShortName = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%' or CONCAT(orgChild3.orgChild3ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%' or CONCAT(orgChild4.orgChild4ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
         }
       } else if (body.type === 3) {
         typeCondition = {
@@ -886,11 +896,15 @@ export class PositionController extends Controller {
           checkChildConditions = {
             orgChild4Id: IsNull(),
           };
+          searchShortName = `CONCAT(orgChild3.orgChild3ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
+        } else {
+          searchShortName = `CONCAT(orgChild3.orgChild3ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%' or CONCAT(orgChild4.orgChild4ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
         }
       } else if (body.type === 4) {
         typeCondition = {
           orgChild4Id: body.id,
         };
+        searchShortName = `CONCAT(orgChild4.orgChild4ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
       }
       let findPosition: any;
       let masterId = new Array();
@@ -978,6 +992,7 @@ export class PositionController extends Controller {
         .leftJoinAndSelect("posMaster.current_holder", "current_holder")
         .leftJoinAndSelect("posMaster.next_holder", "next_holder")
         .where(conditions)
+        .orWhere(searchShortName)
         .orWhere(
           new Brackets((qb) => {
             qb.where(