From 61c44b8f51dc02c17659cef38538674f952806b2 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Wed, 3 Apr 2024 17:32:11 +0700
Subject: [PATCH] no message

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

diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts
index 3def58d..f093b11 100644
--- a/src/controllers/DevelopmentController.ts
+++ b/src/controllers/DevelopmentController.ts
@@ -405,13 +405,17 @@ export class DevelopmentController extends Controller {
   async GetDevelopmentLists(
     @Query("page") page: number = 1,
     @Query("pageSize") pageSize: number = 10,
+    @Query("year") year: number,
     @Query("keyword") keyword?: string,
-    @Query("year") year?: number,
   ) {
     const [development, total] = await AppDataSource.getRepository(Development)
       .createQueryBuilder("development")
-      .andWhere(year == null ? "development.year LIKE :year" : "1=1", { year: `${year}` })
-      .orWhere("development.projectName LIKE :keyword", { keyword: `${keyword}` })
+      .andWhere(year > 0 ? "development.year LIKE :year" : "1=1", {
+        year: `${year.toString()}`,
+      })
+      .andWhere(keyword != undefined ? "development.projectName LIKE :keyword" : "1=1", {
+        keyword: `%${keyword}%`,
+      })
       .select(["development.id", "development.projectName", "development.year"])
       .orderBy("development.year", "DESC")
       .orderBy("development.createdAt", "DESC")