From 507c841362e34637b5bc2c2a44c4a981caed67ae Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Fri, 29 Nov 2024 10:31:36 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20search=20posLevel?= =?UTF-8?q?=20emp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 4 ++++ src/controllers/ProfileEmployeeController.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 6fea64c1..cfea4ea2 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -4100,6 +4100,10 @@ export class ProfileController extends Controller { IFNULL(orgRoot.orgRootShortName, ''), IFNULL(current_holders.posMasterNo , '') ) LIKE :keyword`; + // queryLike = `CONCAT( + // IFNULL(orgRoot.orgRootShortName, ''), + // IFNULL(current_holders.posMasterNo , '') + // ) LIKE :keyword`; } let nodeCondition = "1=1"; let nodeAll = ""; diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 5f6feba2..dd14cf4c 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -1500,7 +1500,7 @@ export class ProfileEmployeeController extends Controller { ) .andWhere( posLevel != undefined && posLevel != null && posLevel != "" - ? "posLevel.posLevelName LIKE :keyword2" + ? `CONCAT(posType.posTypeShortName,' ',posLevel.posLevelName) LIKE :keyword2` : "1=1", { keyword2: `${posLevel}`,