diff --git a/src/components/Dialogs/DialogOrgSelectOneStep.vue b/src/components/Dialogs/DialogOrgSelectOneStep.vue
index a5b50aad2..025e80226 100644
--- a/src/components/Dialogs/DialogOrgSelectOneStep.vue
+++ b/src/components/Dialogs/DialogOrgSelectOneStep.vue
@@ -233,9 +233,12 @@ function onSearch() {
   );
 }
 
-onMounted(async () => {
-  await getTreeData();
-});
+watch(
+  () => modal.value,
+  async () => {
+    modal.value && (await getTreeData());
+  }
+);
 </script>
 <template>
   <q-dialog v-model="modal" persistent full-width>
diff --git a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
index 594cf7720..86a79db1a 100644
--- a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
+++ b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
@@ -170,8 +170,10 @@ async function fetchlistprofile(id: string) {
       linkFile.value = data.file;
 
       // รายชื่อผู้เกษียณอายุราชการ
-      if (data.profile !== null) {
-        const listData = data.profile.map((e: any) => ({
+
+      const listData =
+        data.profile &&
+        data.profile.map((e: any) => ({
           id: e.id,
           profileId: e.profileId,
           order: e.order,
@@ -201,18 +203,17 @@ async function fetchlistprofile(id: string) {
           child4: e.child4,
           child4Id: e.child4Id,
         }));
-        rows.value = listData;
-        rowsData.value = listData;
-      }
 
       if (statusReport.value == false) {
         await fecthCheck(retireld.value);
       } else statusUpload.value = true;
+
+      rows.value = listData;
+      rowsData.value = listData;
+      hideLoader();
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
       hideLoader();
     });
 }
diff --git a/src/modules/06_retirement/components/05_deceased/SendCircularPage.vue b/src/modules/06_retirement/components/05_deceased/SendCircularPage.vue
index 75b43cdb5..a2a300284 100644
--- a/src/modules/06_retirement/components/05_deceased/SendCircularPage.vue
+++ b/src/modules/06_retirement/components/05_deceased/SendCircularPage.vue
@@ -182,6 +182,7 @@ async function saveData() {
     .put(config.API.detailByidDeceased(profileId.value), dataToSend)
     .then(async (res) => {
       await getData();
+      success($q, "เพิ่มข้อมูลสำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);