diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index a3aedc95f..a1639e442 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -43,23 +43,30 @@ export const useLeavelistDataStore = defineStore("leave", () => {
   async function fetchListLeave(data: ListLeave[]) {
     let datalist = data.map((e: ListLeave) => ({
       id: e.id,
-      leaveTypeName: e.leaveTypeName,
-      leaveTypeId: e.leaveTypeId,
-      citizenId: e.citizenId ?? "3120101734950",
-      fullName: e.fullName,
-      agency: e.agency ?? "สำนักงานการเจ้าหน้าที่",
-      org: e.org ?? "กองบริหารทั่วไป/ฝ่ายการเจ้าหน้าที่",
-      position: e.position ?? "นักทรัพยากรบุคคล",
-      level: e.level ?? "ชำนาญการ",
+      leaveTypeName: e.leaveTypeName ?? "-",
+      leaveTypeId: e.leaveTypeId ?? "-",
+      citizenId: e.citizenId ?? "-",
+      fullName:
+        e.fullName !== undefined && e.fullName !== null && e.fullName !== ""
+          ? e.fullName
+          : "-",
+      agency:
+        e.agency !== undefined && e.agency !== null && e.agency !== ""
+          ? e.agency
+          : "-",
+      org: e.org !== undefined && e.org !== null && e.org !== "" ? e.org : "-",
+      position: e.position ?? "-",
+      level: e.level ?? "-",
       dateSendLeave: e.dateSendLeave && date2Thai(e.dateSendLeave),
       dateLeave:
         e.dateSendLeave &&
         date2Thai(e.dateSendLeave) + "-" + date2Thai(e.dateSendLeave),
       status: e.status && convertSatatus(e.status),
     }));
-
+    console.log(datalist);
     mainData.value = datalist;
     rows.value = mainData.value;
+    console.log(mainData.value);
   }
 
   /**