diff --git a/src/entities/view/viewPosMaster.ts b/src/entities/view/viewPosMaster.ts index 74d56466..930c5ff3 100644 --- a/src/entities/view/viewPosMaster.ts +++ b/src/entities/view/viewPosMaster.ts @@ -86,8 +86,17 @@ import { ViewColumn, ViewEntity } from "typeorm"; WHERE pd2.profileId = pd1.profileId ) ) AS profileDiscipline ON profileDiscipline.profileId = profile.id - LEFT JOIN - profileLeave ON profileLeave.profileId = profile.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 = posMaster.current_holderId LEFT JOIN profileAssessment ON profileAssessment.profileId = profile.id LEFT JOIN