diff --git a/src/modules/02_organization/components/TreeMain.vue b/src/modules/02_organization/components/TreeMain.vue
index 360791c01..b8ad0c228 100644
--- a/src/modules/02_organization/components/TreeMain.vue
+++ b/src/modules/02_organization/components/TreeMain.vue
@@ -29,6 +29,9 @@ const { dialogRemove, showLoader, hideLoader, messageError, success } =
 /** props*/
 const nodeTEST = defineModel<OrgTree[]>("nodeTree", { default: [] });
 const nodeId = defineModel<string>("nodeId", { required: true });
+const orgRootId = defineModel<string | undefined>("orgRootId", {
+  required: true,
+});
 const shortName = defineModel<string>("shortName", { required: true });
 const props = defineProps({
   fetchDataTree: {
@@ -98,6 +101,7 @@ const orgId = ref<string>("");
  * @param data ข่อมูล Tree
  */
 function updateSelected(data: DataTree) {
+  orgRootId.value = data?.orgLevel === 0 ? data?.orgTreeId : data?.orgRootId;
   shortName.value = data.orgTreeShortName;
 
   if (!store.treeId || store.treeId != data.orgTreeId) {
diff --git a/src/modules/02_organization/components/TreeTable.vue b/src/modules/02_organization/components/TreeTable.vue
index 2759fd81d..8433bc661 100644
--- a/src/modules/02_organization/components/TreeTable.vue
+++ b/src/modules/02_organization/components/TreeTable.vue
@@ -43,7 +43,7 @@ const treeId = defineModel<string>("treeId", { required: true });
 const reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
 const totalPage = defineModel<number>("totalPage", { required: true });
 const posMaster = defineModel<PosMaster2[]>("posMaster", { required: true });
-// const shortName = defineModel<string>("shortName", { required: true });
+const orgRootId = defineModel<string>("orgRootId", { required: true });
 const props = defineProps({
   filterKeyword: { type: Function, require: true, default: () => {} },
   fetchDataTable: {
@@ -448,7 +448,7 @@ function getSummary() {
 async function onClickDownloadReport(val: string, name: string) {
   showLoader();
   await http
-    .get(config.API.orgReport(val))
+    .get(config.API.orgReport(val) + `/${orgRootId.value}`)
     .then((res) => {
       const data = res.data.result;
       if (data) {
diff --git a/src/modules/02_organization/components/TreeView.vue b/src/modules/02_organization/components/TreeView.vue
index 4196e510f..fb1e1452c 100644
--- a/src/modules/02_organization/components/TreeView.vue
+++ b/src/modules/02_organization/components/TreeView.vue
@@ -31,6 +31,7 @@ const count = defineModel<number>("count", { required: true });
 
 const nodeTree = ref<OrgTree[]>(); // ข้อมูล Tree
 const nodeId = ref<string>(""); // id ของ Tree
+const orgRootId = ref<string>("");
 const orgLevel = ref<number>(0); // levelTree
 const isLoad = ref<boolean>(false); // loadTable
 const isLoadTree = ref<boolean>(false); // loadTable
@@ -261,11 +262,12 @@ onMounted(async () => {
       <div class="col-xs-12 col-sm-3 row">
         <div class="col-12 row no-wrap bg-grey-1">
           <TreeMain
-            v-model:nodeTree="nodeTree"
-            v-model:shortName="shortName"
-            v-model:nodeId="nodeId"
-            :fetchDataTree="fetchDataTree"
-            :fetchDataTable="fetchDataTable"
+            v-model:node-tree="nodeTree"
+            v-model:short-name="shortName"
+            v-model:node-id="nodeId"
+            v-model:org-root-id="orgRootId"
+            :fetch-data-table="fetchDataTable"
+            :fetch-data-tree="fetchDataTree"
           />
 
           <div class="col-12 row">
@@ -334,17 +336,18 @@ onMounted(async () => {
 
               <TreeTable
                 v-if="nodeId !== ''"
-                v-model:nodeTree="nodeTree"
-                v-model:orgLevel="orgLevel"
-                v-model:treeId="nodeId"
-                v-model:reqMaster="reqMaster"
-                v-model:totalPage="totalPage"
-                v-model:posMaster="posMaster"
-                :shortName="shortName"
-                :mainTree="mainTree"
-                :fetchDataTable="fetchDataTable"
-                :filterKeyword="filterKeyword"
-                :fetchDataTree="fetchDataTree"
+                v-model:node-tree="nodeTree"
+                v-model:org-level="orgLevel"
+                v-model:tree-id="nodeId"
+                v-model:pos-master="posMaster"
+                v-model:req-master="reqMaster"
+                v-model:total-page="totalPage"
+                v-model:org-root-id="orgRootId"
+                :short-name="shortName"
+                :main-tree="mainTree"
+                :fetch-data-table="fetchDataTable"
+                :filter-keyword="filterKeyword"
+                :fetch-data-tree="fetchDataTree"
               />
             </div>
             <div class="row col-12 items-center" v-else>