From 8e40c53ea09ef343a9a48eb6ed95ad0778bb41c7 Mon Sep 17 00:00:00 2001
From: harid <harid_pr61@live.rmutl.com>
Date: Fri, 5 Jun 2026 17:31:16 +0700
Subject: [PATCH] =?UTF-8?q?API=20=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87=E0=B9=83=E0=B8=99=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=A1=E0=B8=B1=E0=B8=84=E0=B8=A3=E0=B8=AA=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=9A=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=81=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B9=82=E0=B8=84=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=88=E0=B8=88=E0=B8=B8=E0=B8=9A=E0=B8=B1=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/PositionController.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index 7ed5330c..cd919c19 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -4242,6 +4242,7 @@ export class PositionController extends Controller {
 
     const [posMaster, total] = await AppDataSource.getRepository(PosMaster)
       .createQueryBuilder("posMaster")
+      .leftJoinAndSelect("posMaster.orgRevision", "orgRevision")
       .leftJoinAndSelect("posMaster.orgRoot", "orgRoot")
       .leftJoinAndSelect("posMaster.orgChild1", "orgChild1")
       .leftJoinAndSelect("posMaster.orgChild2", "orgChild2")
@@ -4253,6 +4254,8 @@ export class PositionController extends Controller {
       .leftJoinAndSelect("positions.posType", "posType")
       .leftJoinAndSelect("positions.posLevel", "posLevel")
       .leftJoinAndSelect("positions.posExecutive", "posExecutive")
+      .andWhere("orgRevision.orgRevisionIsCurrent = true")
+      .andWhere("orgRevision.orgRevisionIsDraft = false")
       .andWhere(
         new Brackets((qb) => {
           qb.andWhere(typeCondition).andWhere(conditionA == null ? "1=1" : conditionA, {
@@ -4540,6 +4543,7 @@ export class PositionController extends Controller {
 
     const [posMaster, total] = await AppDataSource.getRepository(PosMaster)
       .createQueryBuilder("posMaster")
+      .leftJoinAndSelect("posMaster.orgRevision", "orgRevision")
       .leftJoinAndSelect("posMaster.orgRoot", "orgRoot")
       .leftJoinAndSelect("posMaster.orgChild1", "orgChild1")
       .leftJoinAndSelect("posMaster.orgChild2", "orgChild2")
@@ -4552,6 +4556,8 @@ export class PositionController extends Controller {
       .leftJoinAndSelect("positions.posLevel", "posLevel")
       .leftJoinAndSelect("positions.posExecutive", "posExecutive")
       .andWhere("posMaster.next_holderId IS NULL")
+      .andWhere("orgRevision.orgRevisionIsCurrent = true")
+      .andWhere("orgRevision.orgRevisionIsDraft = false")
       .andWhere(
         new Brackets((qb) => {
           qb.andWhere(typeCondition)