From c082ae8891ffd80e66181268985839549f85bd31 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Fri, 1 Nov 2024 13:55:37 +0700
Subject: [PATCH] fix

---
 src/controllers/PositionController.ts | 304 ++++++++++++--------------
 1 file changed, 145 insertions(+), 159 deletions(-)

diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index 238c5afc..589a4884 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -1679,7 +1679,7 @@ export class PositionController extends Controller {
       }
       masterId = [...new Set(masterId)];
     }
-
+    
     const revisionCondition = {
       orgRevisionId: body.revisionId,
     };
@@ -1695,171 +1695,157 @@ export class PositionController extends Controller {
         child4: null,
         privilege: "OWNER",
       };
-    const conditions = [
-      {
-        ...checkChildConditions,
-        ...typeCondition,
-        ...revisionCondition,
-        ...(masterId.length > 0 ? { id: In(masterId) } : {}),
-      },
-    ];
-
-    let [posMaster, total] = await AppDataSource.getRepository(PosMaster)
-      .createQueryBuilder("posMaster")
-      .leftJoinAndSelect("posMaster.orgRoot", "orgRoot")
-      .leftJoinAndSelect("posMaster.orgChild1", "orgChild1")
-      .leftJoinAndSelect("posMaster.orgChild2", "orgChild2")
-      .leftJoinAndSelect("posMaster.orgChild3", "orgChild3")
-      .leftJoinAndSelect("posMaster.orgChild4", "orgChild4")
-      .leftJoinAndSelect("posMaster.current_holder", "current_holder")
-      .leftJoinAndSelect("posMaster.next_holder", "next_holder")
-      .leftJoinAndSelect("posMaster.orgRevision", "orgRevision")
-      .where(conditions)
-      .andWhere(
-        _data.root != undefined && _data.root != null
-          ? _data.root[0] != null
-            ? `posMaster.orgRootId IN (:...root)`
-            : `posMaster.orgRootId is null`
-          : "1=1",
+      const conditions = [
         {
-          root: _data.root,
+          ...checkChildConditions,
+          ...typeCondition,
+          ...revisionCondition,
+          ...(body.keyword &&
+            (masterId.length > 0
+              ? { id: In(masterId) }
+              : { posMasterNo: Like(`%${body.keyword}%`) })),
         },
-      )
-      .andWhere(
-        _data.child1 != undefined && _data.child1 != null
-          ? _data.child1[0] != null
-            ? `posMaster.orgChild1Id IN (:...child1)`
-            : `posMaster.orgChild1Id is null`
-          : "1=1",
-        {
-          child1: _data.child1,
-        },
-      )
-      .andWhere(
-        _data.child2 != undefined && _data.child2 != null
-          ? _data.child2[0] != null
-            ? `posMaster.orgChild2Id IN (:...child2)`
-            : `posMaster.orgChild2Id is null`
-          : "1=1",
-        {
-          child2: _data.child2,
-        },
-      )
-      .andWhere(
-        _data.child3 != undefined && _data.child3 != null
-          ? _data.child3[0] != null
-            ? `posMaster.orgChild3Id IN (:...child3)`
-            : `posMaster.orgChild3Id is null`
-          : "1=1",
-        {
-          child3: _data.child3,
-        },
-      )
-      .andWhere(
-        _data.child4 != undefined && _data.child4 != null
-          ? _data.child4[0] != null
-            ? `posMaster.orgChild4Id IN (:...child4)`
-            : `posMaster.orgChild4Id is null`
-          : "1=1",
-        {
-          child4: _data.child4,
-        },
-      )
-      .andWhere(
-        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);
-            }),
-          )
-            .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);
-              }),
+      ];
+  
+      let [posMaster, total] = await AppDataSource.getRepository(PosMaster)
+        .createQueryBuilder("posMaster")
+        .leftJoinAndSelect("posMaster.orgRoot", "orgRoot")
+        .leftJoinAndSelect("posMaster.orgChild1", "orgChild1")
+        .leftJoinAndSelect("posMaster.orgChild2", "orgChild2")
+        .leftJoinAndSelect("posMaster.orgChild3", "orgChild3")
+        .leftJoinAndSelect("posMaster.orgChild4", "orgChild4")
+        .leftJoinAndSelect("posMaster.current_holder", "current_holder")
+        .leftJoinAndSelect("posMaster.next_holder", "next_holder")
+        .leftJoinAndSelect("posMaster.orgRevision", "orgRevision")
+        .where(conditions)
+        .andWhere(
+          _data.root != undefined && _data.root != null
+            ? _data.root[0] != null
+              ? `posMaster.orgRootId IN (:...root)`
+              : `posMaster.orgRootId is null`
+            : "1=1",
+          {
+            root: _data.root,
+          },
+        )
+        .andWhere(
+          _data.child1 != undefined && _data.child1 != null
+            ? _data.child1[0] != null
+              ? `posMaster.orgChild1Id IN (:...child1)`
+              : `posMaster.orgChild1Id is null`
+            : "1=1",
+          {
+            child1: _data.child1,
+          },
+        )
+        .andWhere(
+          _data.child2 != undefined && _data.child2 != null
+            ? _data.child2[0] != null
+              ? `posMaster.orgChild2Id IN (:...child2)`
+              : `posMaster.orgChild2Id is null`
+            : "1=1",
+          {
+            child2: _data.child2,
+          },
+        )
+        .andWhere(
+          _data.child3 != undefined && _data.child3 != null
+            ? _data.child3[0] != null
+              ? `posMaster.orgChild3Id IN (:...child3)`
+              : `posMaster.orgChild3Id is null`
+            : "1=1",
+          {
+            child3: _data.child3,
+          },
+        )
+        .andWhere(
+          _data.child4 != undefined && _data.child4 != null
+            ? _data.child4[0] != null
+              ? `posMaster.orgChild4Id IN (:...child4)`
+              : `posMaster.orgChild4Id is null`
+            : "1=1",
+          {
+            child4: _data.child4,
+          },
+        )
+        .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",
             )
-            .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}%`,
+              },
             )
-            .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);
-              }),
-            );
-        }),
-      )
-      .orderBy("posMaster.posMasterOrder", "ASC")
-      .skip((body.page - 1) * body.pageSize)
-      .take(body.pageSize)
-      .getManyAndCount();
-
-    //แก้ค้นหา
-    let _position: any[] = [];
-    let x: any = null;
-    let y: any = null;
-    if (body.keyword != null && body.keyword != "") {
-      const position = await this.positionRepository.find({
-        relations: ["posType", "posLevel", "posExecutive"],
-        where: { posMasterId: In(posMaster.map((x) => x.id)) },
-        order: { createdAt: "ASC" },
-      });
-      for (let data of position) {
-        x = data.posMasterId;
-        if (y != x) {
-          if (
-            data.positionName.includes(body.keyword) ||
-            data.posType.posTypeName.includes(body.keyword) ||
-            data.posLevel.posLevelName.includes(body.keyword)
-          ) {
-            _position.push(data);
+              .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("posMaster.posMasterOrder", "ASC")
+        .skip((body.page - 1) * body.pageSize)
+        .take(body.pageSize)
+        .getManyAndCount();
+  
+      //แก้ค้นหา
+      let _position: any[] = [];
+      let x: any = null;
+      let y: any = null;
+      if (body.keyword != null && body.keyword != ""){
+        const position = await this.positionRepository.find({
+          relations: ["posType", "posLevel", "posExecutive"],
+          where: { posMasterId: In(posMaster.map(x => x.id))},
+          order: { createdAt: "ASC" } 
+        });
+        for(let data of position){
+          x = data.posMasterId 
+          if(y != x){
+            if(
+              data.positionName.includes(body.keyword) || 
+              data.posType.posTypeName.includes(body.keyword) ||
+              data.posLevel.posLevelName.includes(body.keyword)
+            ){
+              _position.push(data);
+            }
           }
+          y = x;
         }
-        y = x;
       }
-    }
-
-    if (_position.length > 0) {
-      posMaster = posMaster.filter((x) => _position.some((y) => y.posMasterId === x.id));
-    }
+     
+      if(_position.length > 0){
+        posMaster = posMaster.filter((x) => _position.some(y => y.posMasterId === x.id));
+      }
+  
 
     const formattedData = await Promise.all(
       posMaster.map(async (posMaster) => {