From 52e1c635a1791b76e4ce5580027fafeacbd3bdc1 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 26 Jun 2025 16:17:27 +0700
Subject: [PATCH] update viewEmpPosMater

---
 src/entities/view/viewEmployeePosMaster.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/entities/view/viewEmployeePosMaster.ts b/src/entities/view/viewEmployeePosMaster.ts
index 53f565aa..9ba45ebf 100644
--- a/src/entities/view/viewEmployeePosMaster.ts
+++ b/src/entities/view/viewEmployeePosMaster.ts
@@ -87,8 +87,16 @@ import { ViewColumn, ViewEntity } from "typeorm";
             WHERE pd2.profileId = pd1.profileId
         )
     ) AS profileDiscipline ON profileDiscipline.profileId = profileEmployee.id
-    LEFT JOIN 
-        profileLeave ON profileLeave.profileId  = profileEmployee.id 
+    LEFT JOIN (
+    SELECT pl1.*
+    FROM profileLeave pl1
+    INNER JOIN (
+        SELECT profileId, MAX(createdAt) AS maxDate
+        FROM profileLeave
+        GROUP BY profileId
+    ) pl2 ON pl1.profileId = pl2.profileId
+         AND pl1.createdAt = pl2.maxDate
+    ) AS profileLeave ON profileLeave.profileId = employeePosMaster.current_holderId
     LEFT JOIN 
         profileAssessment ON profileAssessment.profileId =  profileEmployee.id 
     LEFT JOIN