diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index 90925d8ca..338b585f1 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -721,6 +721,11 @@ onMounted(async () => {
                                       ? col.value + " " + "(ทับที่)"
                                       : col.value
                                   }}
+                                  <q-icon
+                                    name="mdi-star"
+                                    color="primary"
+                                    v-if="props.row.isDirector"
+                                  />
                                 </div>
                                 <div v-else-if="col.name === 'isPosition'">
                                   <div v-if="col.value">
diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue
index ca0d96a82..a58baf3b9 100644
--- a/src/components/Dialogs/DialogOrgSelectEmployee.vue
+++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue
@@ -696,6 +696,11 @@ onMounted(() => {
                                       ? col.value + " " + "(ทับที่)"
                                       : col.value
                                   }}
+                                  <q-icon
+                                    name="mdi-star"
+                                    color="primary"
+                                    v-if="props.row.isDirector"
+                                  />
                                 </div>
                                 <div v-else-if="col.name === 'isPosition'">
                                   <div v-if="col.value">
diff --git a/src/modules/02_organization/components/DialogFormPosition.vue b/src/modules/02_organization/components/DialogFormPosition.vue
index 58ee748fc..2fa84dfb5 100644
--- a/src/modules/02_organization/components/DialogFormPosition.vue
+++ b/src/modules/02_organization/components/DialogFormPosition.vue
@@ -491,8 +491,9 @@ watch(
   () => formData.isDirector,
   (newData, oldData) => {
     if (newData === true) {
+    
       formData.positionSign = !formData.positionSign
-        ? "ผู้อำนวยการ" + props.dataTree?.orgRootName
+        ? ''
         : formData.positionSign;
     } else {
       formData.positionSign = "";
diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue
index 688e6f045..c930ad715 100644
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@@ -801,6 +801,14 @@ watch(
                   ? col.value + " " + "(นั่งทับตำแหน่ง)"
                   : col.value
               }}
+
+              <q-icon
+                name="mdi-star"
+                color="primary"
+                v-if="props.row.isDirector"
+              >
+                <q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
+              </q-icon>
             </div>
             <div v-else-if="col.name === 'posLevelName'">
               {{
diff --git a/src/modules/02_organization/interface/response/organizational.ts b/src/modules/02_organization/interface/response/organizational.ts
index afdfee0c2..a8fbe6d01 100644
--- a/src/modules/02_organization/interface/response/organizational.ts
+++ b/src/modules/02_organization/interface/response/organizational.ts
@@ -118,6 +118,7 @@ interface PosMaster {
   profilePoslevel: string;
   conditionReason: string;
   isCondition: boolean;
+  isDirector: boolean;
 }
 interface Position2 {
   id: string; // id ตำแหน่ง
@@ -157,6 +158,7 @@ interface PosMaster2 {
   profilePosition: string;
   profilePoslevel: string;
   profilePostype: string;
+  isDirector?: boolean;
 }
 
 interface HistoryPos {
diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue
index cab34e781..70d9da79e 100644
--- a/src/modules/05_placement/components/PersonalList/CardPosition.vue
+++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue
@@ -432,6 +432,13 @@ onMounted(async () => {
                         ? col.value + " " + "(นั่งทับตำแหน่ง)"
                         : col.value
                     }}
+                    <q-icon
+                      name="mdi-star"
+                      color="primary"
+                      v-if="props.row.isDirector"
+                    >
+                      <q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
+                    </q-icon>
                   </div>
                   <div v-else-if="col.name === 'isPosition'">
                     <div v-if="col.value">
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 18431973d..94f0a224c 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -336,6 +336,8 @@ async function getTable() {
             bmaOfficerCheck: data.bmaOfficer,
             statusId: data.statusId,
             draft: convertDraft(data.draft),
+            isDraft: data.draft,
+
             typeCommand: data.typeCommand,
             posTypeCandidateId: data.posTypeCandidateId,
             posTypeCandidateName: data.posTypeCandidateName,
@@ -374,7 +376,7 @@ async function getTable() {
 
       const rowData = await (roleAdmin.value
         ? rowsAll.value
-        : rowsAll.value.filter((x: any) => x.statusId !== "DONE"));
+        : rowsAll.value.filter((x: any) => x.isDraft === true));
 
       // รายชื่อทั้งหมด
       await filterpositionCandidate(rowData);
@@ -779,7 +781,7 @@ async function onUpdateNewRows(type: string, pos: string) {
 
     const isStatusMatch = containStatus.value
       ? item.statusId === "DONE"
-      : item.statusId !== "";
+      : item.statusId !== "DONE";
 
     return isTypeMatch && isPositionMatch && isStatusMatch;
   });
@@ -1394,7 +1396,7 @@ onMounted(async () => {
 
   <!-- dialog เพิ่มรายชื่อ -->
   <q-dialog v-model="modaladdlist" persistent>
-    <q-card style="min-width:70%">
+    <q-card style="min-width: 70%">
       <DialogHeader
         tittle="ส่งรายชื่อไปยังหน่วยงาน"
         :close="clickCloseSendModal"
diff --git a/src/modules/05_placement/interface/index/SelectOrg.ts b/src/modules/05_placement/interface/index/SelectOrg.ts
index 74040c0c0..719452468 100644
--- a/src/modules/05_placement/interface/index/SelectOrg.ts
+++ b/src/modules/05_placement/interface/index/SelectOrg.ts
@@ -9,6 +9,7 @@ interface DataPositionNo {
   isSit: boolean;
   positions: Positions[];
   isCondition: boolean;
+  isDirector?: boolean;
 }
 
 interface Positions {
@@ -24,6 +25,7 @@ interface Positions {
   positionField: string;
   positionIsSelected: boolean;
   positionName: string;
+  isDirector?: boolean;
 }
 
 export type { DataPositionNo };
diff --git a/src/modules/08_registryEmployee/components/DialogSelectPos.vue b/src/modules/08_registryEmployee/components/DialogSelectPos.vue
index 263863f49..e02ba121d 100644
--- a/src/modules/08_registryEmployee/components/DialogSelectPos.vue
+++ b/src/modules/08_registryEmployee/components/DialogSelectPos.vue
@@ -692,6 +692,13 @@ onBeforeMount(async () => {
                                       ? col.value + " " + "(นั่งทับตำแหน่ง)"
                                       : col.value
                                   }}
+                                  <q-icon
+                                    name="mdi-star"
+                                    color="primary"
+                                    v-if="props.row.isDirector"
+                                  >
+                                    <q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
+                                  </q-icon>
                                 </div>
                                 <div v-else-if="col.name === 'isPosition'">
                                   <div v-if="col.value">
diff --git a/src/modules/19_condition/interface/response/Main.ts b/src/modules/19_condition/interface/response/Main.ts
index 0e55be759..b496830c0 100644
--- a/src/modules/19_condition/interface/response/Main.ts
+++ b/src/modules/19_condition/interface/response/Main.ts
@@ -29,6 +29,7 @@ interface DataPositionCondition {
   profilePoslevel: string;
   profilePostype: string;
   positions: Positions[];
+  isDirector?: boolean;
 }
 
 interface Positions {
diff --git a/src/modules/19_condition/view/Main.vue b/src/modules/19_condition/view/Main.vue
index a1bd77916..2e78af69c 100644
--- a/src/modules/19_condition/view/Main.vue
+++ b/src/modules/19_condition/view/Main.vue
@@ -365,7 +365,7 @@ onMounted(async () => {
       <!-- Table -->
       <q-card-section
         class="col-lg-9 col-md-8 col-xs-12 q-gutter-sm scroll"
-        style="height: 80vh;"
+        style="height: 80vh"
         v-if="orgTreeId"
       >
         <div class="row col-12 q-gutter-sm">
@@ -458,6 +458,17 @@ onMounted(async () => {
                       />
                       <span v-else>-</span>
                     </div>
+                    <div v-else-if="col.name === 'posMasterNo'">
+                      {{ col.value }}
+                      <q-icon
+                        name="mdi-star"
+                        color="primary"
+                        v-if="props.row.isDirector"
+                      >
+                        <q-tooltip>ผู้อำนวยการ/หัวหน้า</q-tooltip>
+                      </q-icon>
+                    </div>
+
                     <div v-else>
                       {{ col.value ? col.value : "-" }}
                     </div>
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index f27f7cd70..4a15ce438 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -966,28 +966,28 @@ export const useCounterMixin = defineStore("mixin", () => {
     if (obj) {
       let name =
         obj.child4 != null && obj.child3 != null
-          ? obj.child4 + "/"
+          ? obj.child4 + " "
           : obj.child4 != null
           ? obj.child4
           : "";
 
       name +=
         obj.child3 != null && obj.child2 != null
-          ? obj.child3 + "/"
+          ? obj.child3 + " "
           : obj.child3 !== null
           ? obj.child3
           : "";
 
       name +=
         obj.child2 != null && obj.child1 != null
-          ? obj.child2 + "/"
+          ? obj.child2 + " "
           : obj.child2 != null
           ? obj.child2
           : "";
 
       name +=
         obj.child1 != null && obj.root != null
-          ? obj.child1 + "/"
+          ? obj.child1 + " "
           : obj.child1 != null
           ? obj.child1
           : "";
@@ -1002,28 +1002,28 @@ export const useCounterMixin = defineStore("mixin", () => {
     if (obj) {
       let name =
         obj.child4Old != null && obj.child3Old != null
-          ? obj.child4Old + "/"
+          ? obj.child4Old + " "
           : obj.child4Old != null
           ? obj.child4Old
           : "";
 
       name +=
         obj.child3Old != null && obj.child2Old != null
-          ? obj.child3Old + "/"
+          ? obj.child3Old + " "
           : obj.child3Old !== null
           ? obj.child3Old
           : "";
 
       name +=
         obj.child2Old != null && obj.child1Old != null
-          ? obj.child2Old + "/"
+          ? obj.child2Old + " "
           : obj.child2Old != null
           ? obj.child2Old
           : "";
 
       name +=
         obj.child1Old != null && obj.rootOld != null
-          ? obj.child1Old + "/"
+          ? obj.child1Old + " "
           : obj.child1Old != null
           ? obj.child1Old
           : "";