From 81fd9dd511c0deb0723a32ae8e6bde083e9d4248 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Tue, 9 Apr 2024 13:59:14 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=9A=E0=B8=9A2=E0=B8=81=E0=B8=97.?=
 =?UTF-8?q?=20=E0=B8=81=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B9=80=E0=B8=89?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=B2=E0=B8=B0=E0=B8=84=E0=B8=99=E0=B8=97=E0=B8=B5?=
 =?UTF-8?q?=E0=B9=88=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=80=E0=B8=81=E0=B8=A9?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=93=E0=B9=80=E0=B8=89=E0=B8=9E=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=A3=E0=B8=AD=E0=B8=9A=E0=B8=95=E0=B8=B8=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ReportController.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 16b3d4a..8586c9c 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -1810,7 +1810,7 @@ export class ReportController extends Controller {
           salaryPeriodId: salaryPeriodId,
         },
         type: "NONE", //ไม่ได้เลื่อน
-        isRetired: false, //กรองเฉพาะคนที่ไม่เกษียณ
+        isRetired: salaryPeriod.period === 'APR' ?  In([true, false]) : false, //กรองเฉพาะคนที่ไม่เกษียณเฉพาะรอบตุลา
       },
       order: {
         salaryOrg: {