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)