From fe9eca9b33ca4c8451605c580ecd6c43d3d6e2c3 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 19 Dec 2024 13:26:30 +0700
Subject: [PATCH] #857 (9)

---
 src/controllers/DevelopmentController.ts | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts
index 2364ddc..a5d6fdf 100644
--- a/src/controllers/DevelopmentController.ts
+++ b/src/controllers/DevelopmentController.ts
@@ -59,6 +59,7 @@ import { RequestWithUser } from "../middlewares/user";
 import { DevelopmentRisk, UpdateDevelopmentRisk } from "../entities/DevelopmentRisk";
 import { DevelopmentOther, UpdateDevelopmentOther } from "../entities/DevelopmentOther";
 import permission from "../interfaces/permission";
+import { Brackets } from "typeorm";
 
 @Route("api/v1/development/main")
 @Tags("Development")
@@ -1941,9 +1942,21 @@ export class DevelopmentController extends Controller {
       .andWhere(status != undefined ? "development.status LIKE :status" : "1=1", {
         status: `%${status}%`,
       })
-      .andWhere(keyword != undefined ? "development.projectName LIKE :keyword" : "1=1", {
-        keyword: `%${keyword}%`,
-      })
+      .andWhere(
+        keyword != undefined
+          ? new Brackets ((qb) => {
+              qb.where("development.projectName LIKE :keyword")
+                .orWhere("development.root LIKE :keyword")
+                .orWhere("development.child1 LIKE :keyword")
+                .orWhere("development.child2 LIKE :keyword")
+                .orWhere("development.child3 LIKE :keyword")
+                .orWhere("development.child4 LIKE :keyword");
+            })
+          : "1=1",
+        {
+          keyword: `%${keyword}%`,
+        },
+      )
       .select([
         "development.id",
         "development.projectName",