From 59d426f5d5b3a6f3b3d11f2e4628d908a2544bc1 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Thu, 4 Apr 2024 10:05:34 +0700
Subject: [PATCH] no message

---
 src/controllers/DevelopmentHistoryController.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts
index 4a6e123..a905e02 100644
--- a/src/controllers/DevelopmentHistoryController.ts
+++ b/src/controllers/DevelopmentHistoryController.ts
@@ -192,7 +192,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
       .leftJoinAndSelect("developmentHistory.development", "development")
       .leftJoinAndSelect("developmentHistory.posLevel", "posLevel")
       .leftJoinAndSelect("developmentHistory.posType", "posType")
-      .andWhere("development.year = :year", { year: year })
+      .andWhere(year != 0 || year != null ? "development.year = :year" : "1=1", { year: year })
       .andWhere("developmentHistory.type = :type", { type: type })
       .andWhere(
         new Brackets((qb) => {
@@ -245,7 +245,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
               },
             )
             .orWhere(
-              keyword != null && keyword != ""
+              keyword != null && keyword != "" 
                 ? "posType.posTypeName LIKE :keyword"
                 : "1=1",
               {