From 5c9f2fc98b2c5db08331aae5f48d76c3de7bb4fb Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Fri, 29 Nov 2024 13:15:40 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=84=E0=B8=84=E0=B9=89?=
 =?UTF-8?q?=E0=B8=99=E0=B8=AB=E0=B8=B2=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=87=E0=B8=84=E0=B8=B1=E0=B8=9A=20#816?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/WorkflowController.ts | 28 +++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/controllers/WorkflowController.ts b/src/controllers/WorkflowController.ts
index fbbf38b0..77ca0481 100644
--- a/src/controllers/WorkflowController.ts
+++ b/src/controllers/WorkflowController.ts
@@ -907,6 +907,20 @@ export class WorkflowController extends Controller {
                 {
                   keyword: `%${body.keyword}%`,
                 },
+              ).orWhere(
+                body.keyword != null && body.keyword != ""
+                  ? "viewDirectorActing.posNo LIKE :keyword"
+                  : "1=1",
+                {
+                  keyword: `%${body.keyword}%`,
+                },
+              ).orWhere(
+                body.keyword != null && body.keyword != ""
+                  ? "viewDirectorActing.posExecutiveName LIKE :keyword"
+                  : "1=1",
+                {
+                  keyword: `%${body.keyword}%`,
+                },
               );
           }),
         )
@@ -959,6 +973,20 @@ export class WorkflowController extends Controller {
                 {
                   keyword: `%${body.keyword}%`,
                 },
+              ).orWhere(
+                body.keyword != null && body.keyword != ""
+                  ? "viewDirector.posNo LIKE :keyword"
+                  : "1=1",
+                {
+                  keyword: `%${body.keyword}%`,
+                },
+              ).orWhere(
+                body.keyword != null && body.keyword != ""
+                  ? "viewDirector.posExecutiveName LIKE :keyword"
+                  : "1=1",
+                {
+                  keyword: `%${body.keyword}%`,
+                },
               );
           }),
         )