diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index a512dd017..2a5f0a957 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -547,7 +547,7 @@ onMounted(async () => {
                 dense
                 :nodes="lazy"
                 node-key="orgTreeId"
-                label-key="orgTreeName"
+                label-key="labelName"
                 :filter="filter"
                 no-results-label="ไม่พบข้อมูลที่ค้นหา"
                 no-nodes-label="ไม่มีข้อมูล"
diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue
index 4a2f1fd56..45b1e363c 100644
--- a/src/components/Dialogs/DialogOrgSelectEmployee.vue
+++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue
@@ -522,7 +522,7 @@ onMounted(() => {
                 dense
                 :nodes="lazy"
                 node-key="orgTreeId"
-                label-key="orgTreeName"
+                label-key="labelName"
                 :filter="filter"
                 no-results-label="ไม่พบข้อมูลที่ค้นหา"
                 no-nodes-label="ไม่มีข้อมูล"
@@ -629,7 +629,6 @@ onMounted(() => {
                                   map-options
                                   :options="columns"
                                   option-value="name"
-                                  
                                   style="min-width: 140px"
                                 />
                               </div>
@@ -638,9 +637,7 @@ onMounted(() => {
                           <d-table
                             ref="table"
                             :columns="columns"
-                            :rows="
-                              positionNo.length !== 0 ? positionNo : []
-                            "
+                            :rows="positionNo.length !== 0 ? positionNo : []"
                             :filter="filters"
                             row-key="id"
                             flat
@@ -781,7 +778,9 @@ onMounted(() => {
                               <d-table
                                 ref="table"
                                 :columns="columnsPostition"
-                                :rows="rowsPosition.length !== 0 ? rowsPosition:[]"
+                                :rows="
+                                  rowsPosition.length !== 0 ? rowsPosition : []
+                                "
                                 row-key="id"
                                 flat
                                 bordered
diff --git a/src/components/Dialogs/DialogOrgSelectOneStep.vue b/src/components/Dialogs/DialogOrgSelectOneStep.vue
index 6223d1110..4966af0b5 100644
--- a/src/components/Dialogs/DialogOrgSelectOneStep.vue
+++ b/src/components/Dialogs/DialogOrgSelectOneStep.vue
@@ -274,7 +274,7 @@ onMounted(async () => {
                 dense
                 :nodes="lazy"
                 node-key="orgTreeId"
-                label-key="orgTreeName"
+                label-key="labelName"
                 :filter="filter"
                 no-results-label="ไม่พบข้อมูลที่ค้นหา"
                 no-nodes-label="ไม่มีข้อมูล"
diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
index c5203aced..3329d40f6 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue
@@ -528,7 +528,7 @@ onMounted(async () => {
                   dense
                   :nodes="nodeAgency"
                   node-key="orgTreeId"
-                  label-key="orgTreeName"
+                  label-key="labelName"
                   selected-color="primary"
                   :filter="filterAgency"
                   no-results-label="ไม่พบข้อมูลที่ค้นหา"
diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
index 6b52779cf..9eedebad1 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
@@ -455,7 +455,7 @@ onMounted(() => {
                     dense
                     :nodes="node"
                     node-key="orgTreeId"
-                    label-key="orgTreeName"
+                    label-key="labelName"
                     v-model:expanded="expanded"
                     :filter="filter"
                     no-results-label="ไม่พบข้อมูลที่ค้นหา"