diff --git a/src/modules/02_organizationalNew/components/listView.vue b/src/modules/02_organizationalNew/components/listView.vue
index 365ad22db..78a34c112 100644
--- a/src/modules/02_organizationalNew/components/listView.vue
+++ b/src/modules/02_organizationalNew/components/listView.vue
@@ -106,9 +106,9 @@ async function fetchDataTable(id: string, level: number, action: boolean) {
           const { id, ...rest } = a ? a : p[0];
           const test = { ...e, ...rest };
           dataMain.push(test);
-          posMaster.value = store.fetchPosMaster(dataMain);
         }
       });
+      posMaster.value = store.fetchPosMaster(dataMain);
     })
     .catch((err) => {
       messageError($q, err);
diff --git a/src/modules/02_organizationalNew/interface/response/organizational.ts b/src/modules/02_organizationalNew/interface/response/organizational.ts
index 700f20911..6dd00ece6 100644
--- a/src/modules/02_organizationalNew/interface/response/organizational.ts
+++ b/src/modules/02_organizationalNew/interface/response/organizational.ts
@@ -103,6 +103,8 @@ interface PosMaster {
   positionExecutiveField: string; // ด้านทางการบริหาร
   positionArea: string; // ด้าน/สาขา
   positionIsSelected: boolean; // เป็นตำแหน่งที่ถูกเลือกในรอบนั้น ๆ หรือไม่?
+  fullNameCurrentHolder: string | null;
+  fullNameNextHolder: string | null;
   positions: Position[]; // ตำแหน่ง
 }
 interface Position2 {
diff --git a/src/modules/02_organizationalNew/store/organizational.ts b/src/modules/02_organizationalNew/store/organizational.ts
index fa7ed8822..ca1af9179 100644
--- a/src/modules/02_organizationalNew/store/organizational.ts
+++ b/src/modules/02_organizationalNew/store/organizational.ts
@@ -48,7 +48,13 @@ export const useOrganizational = defineStore("organizationalStore", () => {
   function fetchPosMaster(data: PosMaster[]) {
     const newPosMaster = data.map((e: PosMaster) => ({
       ...e,
-      positionIsSelected: e.positionIsSelected ? "มี" : "ว่าง",
+      positionIsSelected:
+        typeOrganizational.value === "draft" && e.fullNameNextHolder !== null
+          ? e.fullNameNextHolder
+          : typeOrganizational.value !== "draft" &&
+            e.fullNameCurrentHolder !== null
+          ? e.fullNameCurrentHolder
+          : "ว่าง",
       posMasterNo:
         e.orgShortname +
         e.posMasterNoPrefix +