diff --git a/src/modules/19_condition/components/DialogCondition.vue b/src/modules/19_condition/components/DialogCondition.vue
index ff63807e5..274f9aeeb 100644
--- a/src/modules/19_condition/components/DialogCondition.vue
+++ b/src/modules/19_condition/components/DialogCondition.vue
@@ -47,8 +47,8 @@ function onSubmit() {
         formData
       )
       .then(async () => {
-        await props.fetchData?.();
         onCloseDialog();
+        await props.fetchData?.();
         success($q, "บันทึกข้อมูลสำเร็จ");
       })
       .catch((err) => {
diff --git a/src/modules/19_condition/router.ts b/src/modules/19_condition/router.ts
index 8a51b1869..0fbb30eeb 100644
--- a/src/modules/19_condition/router.ts
+++ b/src/modules/19_condition/router.ts
@@ -7,7 +7,7 @@ export default [
     component: mainView,
     meta: {
       Auth: true,
-      Key: "COMMAND",
+      Key: "SYS_POS_CONDITION",
       Role: "STAFF",
     },
   },
diff --git a/src/modules/19_condition/view/Main.vue b/src/modules/19_condition/view/Main.vue
index 1d242aff5..9fc3ec703 100644
--- a/src/modules/19_condition/view/Main.vue
+++ b/src/modules/19_condition/view/Main.vue
@@ -1,8 +1,11 @@
 <script setup lang="ts">
 import { ref, onMounted, watch } from "vue";
 import { useQuasar } from "quasar";
+import { storeToRefs } from "pinia";
 
 import { useCounterMixin } from "@/stores/mixin";
+import { useRoute } from "vue-router";
+import { useStructureTree } from "@/stores/structureTree";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -17,12 +20,15 @@ import LoadView from "@/components/LoadView.vue";
 import DialogCondition from "@/modules/19_condition/components/DialogCondition.vue";
 
 const $q = useQuasar();
+const route = useRoute();
 const { showLoader, hideLoader, messageError } = useCounterMixin();
+const { fetchStructureTree, fetchTreeStrategy } = useStructureTree();
+const { activeId } = storeToRefs(useStructureTree());
 
 const isLoadTable = ref<boolean>(false);
 
 //Tree
-const activeId = ref<string>("");
+// const activeId = ref<string>("");
 const filter = ref<string>("");
 const orgTreeId = ref<string>("");
 const nodeTree = ref<OrgTree[]>([]);
@@ -193,46 +199,9 @@ const columnsExpand = ref<QTableProps["columns"]>([
   },
 ]);
 
-/**
- * function เรียกข้อมูลโครงสร้าง แบบปัจุบัน
- */
-async function fetchOrgActive() {
-  showLoader();
-  http
-    .get(config.API.activeOrganization)
-    .then(async (res) => {
-      const data = res.data.result;
-      if (data) {
-        activeId.value = data.activeId;
-        await fetchDataTree(data.activeId);
-      }
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
-}
-
-/**
- * function fetch ข้อมูลของ Tree
- * @param id id โครงสร้าง
- */
-async function fetchDataTree(id: string) {
-  showLoader();
-  await http
-    .get(config.API.orgByid(id))
-    .then((res) => {
-      const data = res.data.result;
-      nodeTree.value = data.data;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
-    });
+/** function fetch ข้อมูลของ Tree*/
+async function fetchDataTree() {
+  nodeTree.value = await fetchStructureTree(route.meta.Key as string, true);
 }
 
 function onSelectedOrgTree(data: OrgTree) {
@@ -302,7 +271,7 @@ watch(pageSize, () => {
 });
 
 onMounted(async () => {
-  await fetchOrgActive();
+  await fetchDataTree();
 });
 </script>