From 7020908d66f10efe17555e9e867486532a5cbf74 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 25 Dec 2024 18:22:40 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B9=80=E0=B8=87=E0=B8=B7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99=E0=B9=84=E0=B8=82=E0=B8=AA=E0=B9=88=E0=B8=87?=
 =?UTF-8?q?=E0=B8=84=E0=B8=99=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B9=84=E0=B8=94=E0=B9=89?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=95?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B9=81=E0=B8=97=E0=B8=99=E0=B8=9E=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A8=E0=B8=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ReportController.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index e654d63..5345fc7 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -6890,12 +6890,13 @@ export class ReportController extends Controller {
           qb.orWhere({
             salaryOrgId: In(salaryOrgs.map((x) => x.id)),
             amountSpecial: MoreThan(0),
+            type: Not("NONE"),
             status: "PENDING",
-          }).orWhere({
+          })/*.orWhere({
             salaryOrgId: In(salaryOrgs.map((x) => x.id)),
             type: "NONE",
             status: "PENDING",
-          });
+          });*/
         }),
       )
       .andWhere(