From cc10973842f340b6466ac05465d4b023eb5015ff Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Fri, 28 Mar 2025 16:24:26 +0700
Subject: [PATCH] #1275,#1276

---
 src/controllers/PositionController.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index d608bbbc..510e636e 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -1996,11 +1996,11 @@ export class PositionController extends Controller {
     let checkChildConditions: any = {};
     let keywordAsInt: any;
     let searchShortName = "1=1";
-    let searchShortName0 = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
-    let searchShortName1 = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
-    let searchShortName2 = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
-    let searchShortName3 = `CONCAT(orgChild3.orgChild3ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
-    let searchShortName4 = `CONCAT(orgChild4.orgChild4ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix)`;
+    let searchShortName0 = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNo)`;
+    let searchShortName1 = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNo)`;
+    let searchShortName2 = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNo)`;
+    let searchShortName3 = `CONCAT(orgChild3.orgChild3ShortName,posMaster.posMasterNo)`;
+    let searchShortName4 = `CONCAT(orgChild4.orgChild4ShortName,posMaster.posMasterNo)`;
     let _data = await new permission().PermissionOrgList(request, "SYS_ORG");
     if (body.type === 0) {
       typeCondition = {
@@ -2010,7 +2010,7 @@ export class PositionController extends Controller {
         checkChildConditions = {
           orgChild1Id: IsNull(),
         };
-        searchShortName = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
+        searchShortName = `CONCAT(orgRoot.orgRootShortName,posMaster.posMasterNo) like '%${body.keyword}%'`;
       } else {
       }
     } else if (body.type === 1) {
@@ -2021,7 +2021,7 @@ export class PositionController extends Controller {
         checkChildConditions = {
           orgChild2Id: IsNull(),
         };
-        searchShortName = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
+        searchShortName = `CONCAT(orgChild1.orgChild1ShortName,posMaster.posMasterNo) like '%${body.keyword}%'`;
       } else {
       }
     } else if (body.type === 2) {
@@ -2032,7 +2032,7 @@ export class PositionController extends Controller {
         checkChildConditions = {
           orgChild3Id: IsNull(),
         };
-        searchShortName = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
+        searchShortName = `CONCAT(orgChild2.orgChild2ShortName,posMaster.posMasterNo) like '%${body.keyword}%'`;
       } else {
       }
     } else if (body.type === 3) {
@@ -2043,14 +2043,14 @@ export class PositionController extends Controller {
         checkChildConditions = {
           orgChild4Id: IsNull(),
         };
-        searchShortName = `CONCAT(orgChild3.orgChild3ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
+        searchShortName = `CONCAT(orgChild3.orgChild3ShortName,posMaster.posMasterNo) like '%${body.keyword}%'`;
       } else {
       }
     } else if (body.type === 4) {
       typeCondition = {
         orgChild4Id: body.id,
       };
-      searchShortName = `CONCAT(orgChild4.orgChild4ShortName,posMaster.posMasterNoPrefix,posMaster.posMasterNo,posMaster.posMasterNoSuffix) like '%${body.keyword}%'`;
+      searchShortName = `CONCAT(orgChild4.orgChild4ShortName,posMaster.posMasterNo) like '%${body.keyword}%'`;
     }
     let findPosition: any;
     let masterId = new Array();