From 87a91b035ca783f8d16b6328fbc46272f9c387fa Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Fri, 31 Jan 2025 10:54:25 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index a0ee00a5..3ef3ca29 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -1616,16 +1616,16 @@ export class ProfileEmployeeController extends Controller {
       )
       .andWhere(
         isProbation != undefined && isProbation != null
-          ? `profile.isProbation = ${isProbation}`
+          ? `profileEmployee.isProbation = ${isProbation}`
           : "1=1",
       )
       .andWhere(
         isRetire != undefined && isRetire != null
           ? isRetire == false
-            ? `profile.dateLeave IS NULL`
+            ? `profileEmployee.dateLeave IS NULL`
             : isRetire == true && retireType != undefined && retireType != null
-              ? `profile.dateLeave IS NOT NULL AND profile.leaveType = '${retireType}'`
-              : `profile.dateLeave IS NOT NULL`
+              ? `profileEmployee.dateLeave IS NOT NULL AND profileEmployee.leaveType = '${retireType}'`
+              : `profileEmployee.dateLeave IS NOT NULL`
           : "1=1"
       )
       .andWhere("profileEmployee.employeeClass LIKE :type", {