From 3111e10bfe20cecee7501fc494406d562264f4ef Mon Sep 17 00:00:00 2001
From: Adisak <adisak@frappet.com>
Date: Mon, 15 Dec 2025 11:48:18 +0700
Subject: [PATCH] #2119

---
 src/controllers/PositionController.ts | 132 +++++++++++++-------------
 1 file changed, 64 insertions(+), 68 deletions(-)

diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index d2c5fc87..a7f2db82 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -2301,52 +2301,48 @@ export class PositionController extends Controller {
           child4: _data.child4,
         },
       )
-      .andWhere(
+      .orWhere(
         new Brackets((qb) => {
-          qb.orWhere(
-            new Brackets((qb) => {
-              qb.andWhere(
-                body.keyword != null && body.keyword != ""
-                  ? body.isAll == false
-                    ? searchShortName
-                    : `CASE WHEN posMaster.orgChild1 is null THEN ${searchShortName0} WHEN posMaster.orgChild2 is null THEN ${searchShortName1} WHEN posMaster.orgChild3 is null THEN ${searchShortName2} WHEN posMaster.orgChild4 is null THEN ${searchShortName3} ELSE ${searchShortName4} END LIKE '%${body.keyword}%'`
-                  : "1=1",
-              )
-                .andWhere(checkChildConditions)
-                .andWhere(typeCondition)
-                .andWhere(revisionCondition);
-            }),
+          qb.andWhere(
+            body.keyword != null && body.keyword != ""
+              ? body.isAll == false
+                ? searchShortName
+                : `CASE WHEN posMaster.orgChild1 is null THEN ${searchShortName0} WHEN posMaster.orgChild2 is null THEN ${searchShortName1} WHEN posMaster.orgChild3 is null THEN ${searchShortName2} WHEN posMaster.orgChild4 is null THEN ${searchShortName3} ELSE ${searchShortName4} END LIKE '%${body.keyword}%'`
+              : "1=1",
           )
-            .orWhere(
-              new Brackets((qb) => {
-                qb.andWhere(
-                  body.keyword != null && body.keyword != ""
-                    ? `CONCAT(current_holder.prefix, current_holder.firstName," ",current_holder.lastName)  like '%${body.keyword}%'`
-                    : "1=1",
-                  {
-                    keyword: `%${body.keyword}%`,
-                  },
-                )
-                  .andWhere(checkChildConditions)
-                  .andWhere(typeCondition)
-                  .andWhere(revisionCondition);
-              }),
-            )
-            .orWhere(
-              new Brackets((qb) => {
-                qb.andWhere(
-                  body.keyword != null && body.keyword != ""
-                    ? `CASE WHEN orgRevision.orgRevisionIsDraft = true THEN CONCAT(next_holder.prefix, next_holder.firstName,' ', next_holder.lastName) ELSE CONCAT(current_holder.prefix, current_holder.firstName,' ' , current_holder.lastName) END LIKE '%${body.keyword}%'`
-                    : "1=1",
-                  {
-                    keyword: `%${body.keyword}%`,
-                  },
-                )
-                  .andWhere(checkChildConditions)
-                  .andWhere(typeCondition)
-                  .andWhere(revisionCondition);
-              }),
-            );
+            .andWhere(checkChildConditions)
+            .andWhere(typeCondition)
+            .andWhere(revisionCondition);
+        }),
+      )
+      .orWhere(
+        new Brackets((qb) => {
+          qb.andWhere(
+            body.keyword != null && body.keyword != ""
+              ? `CONCAT(current_holder.prefix, current_holder.firstName," ",current_holder.lastName)  like '%${body.keyword}%'`
+              : "1=1",
+            {
+              keyword: `%${body.keyword}%`,
+            },
+          )
+            .andWhere(checkChildConditions)
+            .andWhere(typeCondition)
+            .andWhere(revisionCondition);
+        }),
+      )
+      .orWhere(
+        new Brackets((qb) => {
+          qb.andWhere(
+            body.keyword != null && body.keyword != ""
+              ? `CASE WHEN orgRevision.orgRevisionIsDraft = true THEN CONCAT(next_holder.prefix, next_holder.firstName,' ', next_holder.lastName) ELSE CONCAT(current_holder.prefix, current_holder.firstName,' ' , current_holder.lastName) END LIKE '%${body.keyword}%'`
+              : "1=1",
+            {
+              keyword: `%${body.keyword}%`,
+            },
+          )
+            .andWhere(checkChildConditions)
+            .andWhere(typeCondition)
+            .andWhere(revisionCondition);
         }),
       )
       .orderBy("orgRoot.orgRootOrder", "ASC")
@@ -2824,50 +2820,50 @@ export class PositionController extends Controller {
     const type0LastPosMasterNo =
       requestBody.type == 0
         ? await this.posMasterRepository.find({
-            where: {
-              orgRootId: requestBody.id,
-              orgChild1Id: IsNull(),
-            },
-          })
+          where: {
+            orgRootId: requestBody.id,
+            orgChild1Id: IsNull(),
+          },
+        })
         : [];
 
     const type1LastPosMasterNo =
       requestBody.type == 1
         ? await this.posMasterRepository.find({
-            where: {
-              orgChild1Id: requestBody.id,
-              orgChild2Id: IsNull(),
-            },
-          })
+          where: {
+            orgChild1Id: requestBody.id,
+            orgChild2Id: IsNull(),
+          },
+        })
         : [];
 
     const type2LastPosMasterNo =
       requestBody.type == 2
         ? await this.posMasterRepository.find({
-            where: {
-              orgChild2Id: requestBody.id,
-              orgChild3Id: IsNull(),
-            },
-          })
+          where: {
+            orgChild2Id: requestBody.id,
+            orgChild3Id: IsNull(),
+          },
+        })
         : [];
 
     const type3LastPosMasterNo =
       requestBody.type == 3
         ? await this.posMasterRepository.find({
-            where: {
-              orgChild3Id: requestBody.id,
-              orgChild4Id: IsNull(),
-            },
-          })
+          where: {
+            orgChild3Id: requestBody.id,
+            orgChild4Id: IsNull(),
+          },
+        })
         : [];
 
     const type4LastPosMasterNo =
       requestBody.type == 4
         ? await this.posMasterRepository.find({
-            where: {
-              orgChild4Id: requestBody.id,
-            },
-          })
+          where: {
+            orgChild4Id: requestBody.id,
+          },
+        })
         : [];
 
     const allLastPosMasterNo = [