diff --git a/src/components/Dialogs/DialogOrgSelectOneStep.vue b/src/components/Dialogs/DialogOrgSelectOneStep.vue
index a1c195211..5ee8ba998 100644
--- a/src/components/Dialogs/DialogOrgSelectOneStep.vue
+++ b/src/components/Dialogs/DialogOrgSelectOneStep.vue
@@ -228,7 +228,7 @@ async function getActive() {
   showLoader();
   await http
     .get(config.API.activeOrganization)
-    .then((res) => {
+    .then(async (res) => {
       const data = res.data.result;
 
       formActive.activeId = data.activeId;
@@ -238,12 +238,10 @@ async function getActive() {
       formActive.orgPublishDate = data.orgPublishDate;
       formActive.isPublic = data.isPublic;
 
-      getTreeData(data.activeId);
+      await getTreeData(data.activeId);
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
       hideLoader();
     });
 }
diff --git a/src/modules/13_salary/components/Command/step03.vue b/src/modules/13_salary/components/Command/step03.vue
index 27f8f535a..08e380336 100644
--- a/src/modules/13_salary/components/Command/step03.vue
+++ b/src/modules/13_salary/components/Command/step03.vue
@@ -2,6 +2,8 @@
 import { ref, onMounted } from "vue";
 import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
+import DialogOrgSelectOneStep from "@/components/Dialogs/DialogOrgSelectOneStep.vue";
+
 import DialogHeader from "@/modules/04_registry/components/DialogHeader.vue";
 import type { QInput, QForm } from "quasar";
 import type { treeTab } from "@/modules/05_placement/interface/index/Main";
@@ -531,7 +533,7 @@ const updateData = (row: DataCopyOrder) => {
     </div>
   </div>
 
-  <q-dialog v-model="modal" persistent full-width>
+  <!-- <q-dialog v-model="modal" persistent full-width>
     <q-card>
       <DialogHeader tittle="เลือกรายชื่อตามหน่วยงาน" :close="clickClose" />
       <q-separator />
@@ -660,5 +662,12 @@ const updateData = (row: DataCopyOrder) => {
         />
       </q-card-actions>
     </q-card>
-  </q-dialog>
+  </q-dialog> -->
+
+  <DialogOrgSelectOneStep
+    v-model:modal="modal"
+    :title="'เลือกรายชื่อตามหน่วยงาน'"
+    v-model:selectedModal="selectedModal"
+    :saveData="saveData"
+  />
 </template>