From 1ed68781672b11359c6ec27f914fc23e2572651f Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 21 May 2025 14:54:10 +0700 Subject: [PATCH] =?UTF-8?q?fix=20issue=20#1559=20=E0=B9=80=E0=B8=9E?= =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=97?= =?UTF-8?q?=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?= =?UTF-8?q?=E0=B8=AF=20=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=84=E0=B8=94=E0=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 1f675d60..1bfdd706 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -8917,12 +8917,6 @@ export class ProfileController extends Controller { keyword: `%${body.keyword}%`, }, ) - // .orWhere(`profile.firstName LIKE :keyword and profile.isProbation = ${isProbation}`, { - // keyword: `%${body.keyword}%`, - // }) - // .orWhere(`profile.lastName LIKE :keyword and profile.isProbation = ${isProbation}`, { - // keyword: `%${body.keyword}%`, - // }) .orWhere(`profile.position LIKE :keyword and profile.isProbation = ${isProbation}`, { keyword: `%${body.keyword}%`, }) @@ -8934,6 +8928,21 @@ export class ProfileController extends Controller { ) .orWhere(`posType.posTypeName LIKE :keyword and profile.isProbation = ${isProbation}`, { keyword: `%${body.keyword}%`, + }) + .orWhere(`orgRoot.orgRootName LIKE :keyword and profile.isProbation = ${isProbation}`, { + keyword: `%${body.keyword}%`, + }) + .orWhere(`orgChild1.orgChild1Name LIKE :keyword and profile.isProbation = ${isProbation}`, { + keyword: `%${body.keyword}%`, + }) + .orWhere(`orgChild2.orgChild2Name LIKE :keyword and profile.isProbation = ${isProbation}`, { + keyword: `%${body.keyword}%`, + }) + .orWhere(`orgChild3.orgChild3Name LIKE :keyword and profile.isProbation = ${isProbation}`, { + keyword: `%${body.keyword}%`, + }) + .orWhere(`orgChild4.orgChild4Name LIKE :keyword and profile.isProbation = ${isProbation}`, { + keyword: `%${body.keyword}%`, }); }), )