diff --git a/src/modules/05_placement/views/09_reportMain.vue b/src/modules/05_placement/views/09_reportMain.vue
index faa55bb04..30053af10 100644
--- a/src/modules/05_placement/views/09_reportMain.vue
+++ b/src/modules/05_placement/views/09_reportMain.vue
@@ -94,7 +94,7 @@ function onUpdateYear(val: number) {
 
 function onSelectedNode(data: any) {
   org.value = data.orgName;
-  nodeId.value = data.orgTreeId;
+  nodeId.value = data.orgTreeDnaId;
   nodeLevel.value = data.orgLevel;
   orgTreeDnaId.value = data.orgTreeDnaId;
   expandedModal.value = false;
@@ -297,7 +297,7 @@ onMounted(() => {
                         <q-tree
                           dense
                           :nodes="node"
-                          node-key="orgTreeId"
+                          node-key="orgTreeDnaId"
                           label-key="labelName"
                           v-model:expanded="expanded"
                           :filter="filterTree.trim()"
@@ -308,7 +308,7 @@ onMounted(() => {
                           <template v-slot:default-header="prop">
                             <q-item
                               @click.stop="onSelectedNode(prop.node)"
-                              :active="nodeId === prop.node.orgTreeId"
+                              :active="nodeId === prop.node.orgTreeDnaId"
                               clickable
                               active-class="my-list-link text-primary text-weight-medium"
                               class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
diff --git a/src/modules/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue
index 01454d49f..b367b6490 100644
--- a/src/modules/09_leave/views/06_ReportMain.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -133,7 +133,7 @@ async function fetchDataTree() {
  */
 function onSelectedNode(data: any) {
   org.value = data.orgName;
-  nodeId.value = data.orgTreeId;
+  nodeId.value = data.orgTreeDnaId;
   nodeLevel.value = data.orgLevel;
   expandedModal.value = false;
   orgTreeDnaId.value = data.orgTreeDnaId;
@@ -626,7 +626,7 @@ onMounted(() => {
                         <q-tree
                           dense
                           :nodes="node"
-                          node-key="orgTreeId"
+                          node-key="orgTreeDnaId"
                           label-key="labelName"
                           v-model:expanded="expanded"
                           :filter="filterTree.trim()"
@@ -637,7 +637,7 @@ onMounted(() => {
                           <template v-slot:default-header="prop">
                             <q-item
                               @click.stop="onSelectedNode(prop.node)"
-                              :active="nodeId === prop.node.orgTreeId"
+                              :active="nodeId === prop.node.orgTreeDnaId"
                               clickable
                               active-class="my-list-link text-primary text-weight-medium"
                               class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
@@ -847,7 +847,10 @@ onMounted(() => {
                           </template>
                         </datepicker>
                       </div>
-                      <div class="col-12" v-if="yearType == 'MONTH' || leaveType == 'MONTH'">
+                      <div
+                        class="col-12"
+                        v-if="yearType == 'MONTH' || leaveType == 'MONTH'"
+                      >
                         <datepicker
                           v-model="dateMonth"
                           :locale="'th'"