From 3de8591ce0005c85bf2731451bb31f0dddbf739a Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Fri, 5 Apr 2024 10:27:01 +0700
Subject: [PATCH] fix

---
 src/controllers/DevelopmentScholarshipController.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/controllers/DevelopmentScholarshipController.ts b/src/controllers/DevelopmentScholarshipController.ts
index 7f7abe9..063cfe0 100644
--- a/src/controllers/DevelopmentScholarshipController.ts
+++ b/src/controllers/DevelopmentScholarshipController.ts
@@ -151,12 +151,18 @@ export class DevelopmentScholarshipController extends Controller {
       .leftJoinAndSelect("developmentScholarship.posLevel", "posLevel")
       .leftJoinAndSelect("developmentScholarship.posType", "posType")
       .andWhere(
-        year != 0 && year != null && year != undefined
+        year !== 0 && year != null && year != undefined
           ? "developmentScholarship.scholarshipYear = :scholarshipYear"
           : "1=1",
         { scholarshipYear: year },
       )
-      .andWhere("developmentScholarship.scholarshipType = :scholarshipType", { scholarshipType: scholarshipType })
+      .andWhere(
+        scholarshipType != null && scholarshipType != undefined
+        ?
+        "developmentScholarship.scholarshipType = :scholarshipType"
+        : "1=1", 
+        { scholarshipType: scholarshipType }
+        )
       .andWhere(
           new Brackets((qb) => {
             qb.where(