diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 2c3a64d7..a7f82978 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -438,67 +438,100 @@ export class ProfileController extends Controller {
       where: { profileId: id },
       select: ["certificateType", "issuer", "certificateNo", "issueDate"],
     });
-    const Cert = certs.map((item) => ({
-      CertificateType: item.certificateType ?? null,
-      Issuer: item.issuer ?? null,
-      CertificateNo: Extension.ToThaiNumber(item.certificateNo) ?? null,
-      IssueDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate)) ?? null,
-    }));
+    const Cert = certs.length > 0 
+      ? certs.map((item) => ({
+        CertificateType: item.certificateType ?? null,
+        Issuer: item.issuer ?? null,
+        CertificateNo: Extension.ToThaiNumber(item.certificateNo) ?? null,
+        IssueDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate)) ?? null,
+      }))
+      :[{
+        CertificateType: "-",
+        Issuer: "-",
+        CertificateNo: "-",
+        IssueDate: "-"
+      }];
     const trainings = await this.trainingRepository.find({
       select: ["startDate", "endDate", "place", "department", "name"],
       where: { profileId: id },
     });
-    const Training = trainings.map((item) => ({
-      Institute: item.department ?? "",
-      Start:
-        item.startDate == null
-          ? ""
-          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate)),
-      End:
-        item.endDate == null ? "" : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate)),
-      Date:
-        item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
-          : "",
-      Level: "",
-      Degree: item.name,
-      Field: "",
-    }));
+    const Training = trainings.length > 0
+      ? trainings.map((item) => ({
+        Institute: item.department ?? "",
+        Start:
+          item.startDate == null
+            ? ""
+            : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate)),
+        End:
+          item.endDate == null ? "" : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate)),
+        Date:
+          item.startDate && item.endDate
+            ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
+            : "",
+        Level: "",
+        Degree: item.name,
+        Field: "",
+      }))
+      : [{
+        Institute: "-",
+        Start: "-",
+        End: "-",
+        Date: "-",
+        Level: "-",
+        Degree: "-",
+        Field: "-",
+      }];
 
     const disciplines = await this.disciplineRepository.find({
       select: ["refCommandDate", "refCommandNo", "detail"],
       where: { profileId: id },
     });
-    const Discipline = disciplines.map((item) => ({
-      DisciplineYear:
-        Extension.ToThaiNumber(new Date(item.refCommandDate).getFullYear().toString()) ?? null,
-      DisciplineDetail: item.detail ?? null,
-      RefNo: Extension.ToThaiNumber(item.refCommandNo) ?? null,
-    }));
+    const Discipline = disciplines.length > 0 
+      ? disciplines.map((item) => ({
+        DisciplineYear:
+          Extension.ToThaiNumber(new Date(item.refCommandDate).getFullYear().toString()) ?? null,
+        DisciplineDetail: item.detail ?? null,
+        RefNo: Extension.ToThaiNumber(item.refCommandNo) ?? null,
+      }))
+      : [{
+        DisciplineYear: "-",
+        DisciplineDetail: "-",
+        RefNo: "-",
+      }];
 
     const educations = await this.educationRepository.find({
       select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute"],
       where: { profileId: id },
       order: { lastUpdatedAt: "DESC" },
     });
-    const Education = educations.map((item) => ({
-      Institute: item.institute,
-      Start:
-        item.startDate == null
-          ? ""
-          : Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString()),
-      End:
-        item.endDate == null
-          ? ""
-          : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
-      Date:
-        item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
-          : "",
-      Level: item.educationLevel ?? "",
-      Degree: item.degree ? `${item.degree} ${item.field ? item.field : ""}` : "",
-      Field: item.field ?? "-",
-    }));
+    const Education = educations.length > 0
+      ? educations.map((item) => ({
+        Institute: item.institute,
+        Start:
+          item.startDate == null
+            ? ""
+            : Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString()),
+        End:
+          item.endDate == null
+            ? ""
+            : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
+        Date:
+          item.startDate && item.endDate
+            ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
+            : "",
+        Level: item.educationLevel ?? "",
+        Degree: item.degree ? `${item.degree} ${item.field ? item.field : ""}` : "",
+        Field: item.field ?? "-",
+      }))
+      : [{
+        Institute: "-",
+        Start: "-",
+        End: "-",
+        Date: "-",
+        Level: "-",
+        Degree: "-",
+        Field: "-",
+      }];
     const salarys = await this.salaryRepository.find({
       select: [
         "date",
@@ -515,22 +548,36 @@ export class ProfileController extends Controller {
       order: { order: "ASC" }
     });
 
-    const Salary = salarys.map((item) => ({
-      SalaryDate: item.date ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.date)) : null,
-      Position: item.position != null ? Extension.ToThaiNumber(item.position) : null,
-      PosNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : null,
-      Salary: item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
-      Rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
-      RefAll: item.templateDoc ? Extension.ToThaiNumber(item.templateDoc) : null,
-      PositionLevel: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
-      PositionType: item.positionType ?? null,
-      PositionAmount:
-        item.positionSalaryAmount == null
-          ? null
-          : Extension.ToThaiNumber(item.positionSalaryAmount.toLocaleString()),
-      FullName: `${profiles?.prefix}${profiles?.firstName} ${profiles?.lastName}`,
-      OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
-    }));
+    const Salary = salarys.length > 0
+      ? salarys.map((item) => ({
+        SalaryDate: item.date ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.date)) : null,
+        Position: item.position != null ? Extension.ToThaiNumber(item.position) : null,
+        PosNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : null,
+        Salary: item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
+        Rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
+        RefAll: item.templateDoc ? Extension.ToThaiNumber(item.templateDoc) : null,
+        PositionLevel: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
+        PositionType: item.positionType ?? null,
+        PositionAmount:
+          item.positionSalaryAmount == null
+            ? null
+            : Extension.ToThaiNumber(item.positionSalaryAmount.toLocaleString()),
+        FullName: `${profiles?.prefix}${profiles?.firstName} ${profiles?.lastName}`,
+        OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
+      }))
+      : [{
+        SalaryDate: "-",
+        Position: "-",
+        PosNo: "-",
+        Salary: "-",
+        Rank: "-",
+        RefAll: "-",
+        PositionLevel: "-",
+        PositionType: "-",
+        PositionAmount: "-",
+        FullName: "-",
+        OcFullPath: "-",
+      }];
 
     const insignias = await this.profileInsigniaRepo.find({
       relations: {
@@ -541,36 +588,56 @@ export class ProfileController extends Controller {
       where: { profileId: id },
       order: { receiveDate: "ASC" },
     });
-    const Insignia = insignias.map((item) => ({
-      ReceiveDate: item.receiveDate
-        ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.receiveDate))
-        : "",
-      InsigniaName: item.insignia.name,
-      InsigniaShortName: item.insignia.shortName,
-      InsigniaTypeName: item.insignia.insigniaType.name,
-      No: item.no ? Extension.ToThaiNumber(item.no) : "",
-      Issue: item.issue ? item.issue : "",
-      VolumeNo: item.volumeNo ? Extension.ToThaiNumber(item.volumeNo) : "",
-      Volume: item.volume ? Extension.ToThaiNumber(item.volume) : "",
-      Section: item.section ? Extension.ToThaiNumber(item.section) : "",
-      Page: item.page ? Extension.ToThaiNumber(item.page) : "",
-      RefCommandDate: item.refCommandDate
-        ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.refCommandDate))
-        : "",
-    }));
+    const Insignia = insignias.length > 0
+      ? insignias.map((item) => ({
+        ReceiveDate: item.receiveDate
+          ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.receiveDate))
+          : "",
+        InsigniaName: item.insignia.name,
+        InsigniaShortName: item.insignia.shortName,
+        InsigniaTypeName: item.insignia.insigniaType.name,
+        No: item.no ? Extension.ToThaiNumber(item.no) : "",
+        Issue: item.issue ? item.issue : "",
+        VolumeNo: item.volumeNo ? Extension.ToThaiNumber(item.volumeNo) : "",
+        Volume: item.volume ? Extension.ToThaiNumber(item.volume) : "",
+        Section: item.section ? Extension.ToThaiNumber(item.section) : "",
+        Page: item.page ? Extension.ToThaiNumber(item.page) : "",
+        RefCommandDate: item.refCommandDate
+          ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.refCommandDate))
+          : "",
+      }))
+      : [{
+        ReceiveDate: "-",
+        InsigniaName: "-",
+        InsigniaShortName: "-",
+        InsigniaTypeName: "-",
+        No: "-",
+        Issue: "-",
+        VolumeNo: "-",
+        Volume: "-",
+        Section: "-",
+        Page: "-",
+        RefCommandDate: "-",
+      }];
 
     const leaves = await this.profileLeaveRepository.find({
       relations: { leaveType: true },
       where: { profileId: id },
       order: { dateLeaveStart: "ASC" },
     });
-    const Leave = leaves.map((item) => ({
-      LeaveTypeName: item.leaveType.name,
-      DateLeaveStart: item.dateLeaveStart
-        ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart))
-        : "",
-      LeaveDays: item.leaveDays ? Extension.ToThaiNumber(item.leaveDays.toString()) : "",
-    }));
+    const Leave = leaves.length > 0
+      ? leaves.map((item) => ({
+        LeaveTypeName: item.leaveType.name,
+        DateLeaveStart: item.dateLeaveStart
+          ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart))
+          : "",
+        LeaveDays: item.leaveDays ? Extension.ToThaiNumber(item.leaveDays.toString()) : "",
+      }))
+      : [{
+        LeaveTypeName: "-",
+        DateLeaveStart: "-",
+        LeaveDays: "-",
+      }];
 
     return new HttpSuccess({
       Profile: [Profile],
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index b1fe6f53..1503209b 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -447,67 +447,100 @@ export class ProfileEmployeeController extends Controller {
       where: { profileEmployeeId: id },
       select: ["certificateType", "issuer", "certificateNo", "issueDate"],
     });
-    const Cert = certs.map((item) => ({
-      CertificateType: item.certificateType ?? null,
-      Issuer: item.issuer ?? null,
-      CertificateNo: Extension.ToThaiNumber(item.certificateNo) ?? null,
-      IssueDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate)) ?? null,
-    }));
+    const Cert = certs.length > 0 
+      ? certs.map((item) => ({
+        CertificateType: item.certificateType ?? null,
+        Issuer: item.issuer ?? null,
+        CertificateNo: Extension.ToThaiNumber(item.certificateNo) ?? null,
+        IssueDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate)) ?? null,
+      }))
+      :[{
+        CertificateType: "-",
+        Issuer: "-",
+        CertificateNo: "-",
+        IssueDate: "-"
+      }];
     const trainings = await this.trainingRepository.find({
       select: ["startDate", "endDate", "place", "department"],
       where: { profileEmployeeId: id },
     });
-    const Training = trainings.map((item) => ({
-      Institute: item.department ?? "",
-      Start:
-        item.startDate == null
-          ? ""
-          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate)),
-      End:
-        item.endDate == null ? "" : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate)),
-      Date:
-        item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
-          : "",
-      Level: "",
-      Degree: item.name,
-      Field: "",
-    }));
+    const Training = trainings.length > 0
+      ? trainings.map((item) => ({
+        Institute: item.department ?? "",
+        Start:
+          item.startDate == null
+            ? ""
+            : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate)),
+        End:
+          item.endDate == null ? "" : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate)),
+        Date:
+          item.startDate && item.endDate
+            ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
+            : "",
+        Level: "",
+        Degree: item.name,
+        Field: "",
+      }))
+      : [{
+        Institute: "-",
+        Start: "-",
+        End: "-",
+        Date: "-",
+        Level: "-",
+        Degree: "-",
+        Field: "-",
+      }];
 
     const disciplines = await this.disciplineRepository.find({
       select: ["refCommandDate", "refCommandNo", "detail"],
       where: { profileEmployeeId: id },
     });
-    const Discipline = disciplines.map((item) => ({
-      DisciplineYear:
-        Extension.ToThaiNumber(new Date(item.refCommandDate).getFullYear().toString()) ?? null,
-      DisciplineDetail: item.detail ?? null,
-      RefNo: Extension.ToThaiNumber(item.refCommandNo) ?? null,
-    }));
+    const Discipline = disciplines.length > 0 
+      ? disciplines.map((item) => ({
+        DisciplineYear:
+          Extension.ToThaiNumber(new Date(item.refCommandDate).getFullYear().toString()) ?? null,
+        DisciplineDetail: item.detail ?? null,
+        RefNo: Extension.ToThaiNumber(item.refCommandNo) ?? null,
+      }))
+      : [{
+        DisciplineYear: "-",
+        DisciplineDetail: "-",
+        RefNo: "-",
+      }];
 
     const educations = await this.educationRepository.find({
       select: ["startDate", "endDate", "educationLevel", "degree", "field", "institute"],
       where: { profileEmployeeId: id },
       order: { lastUpdatedAt: "DESC" },
     });
-    const Education = educations.map((item) => ({
-      Institute: item.institute ?? null,
-      Start:
-        item.startDate == null
-          ? ""
-          : Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString()),
-      End:
-        item.endDate == null
-          ? ""
-          : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
-      Date:
-        item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
-          : "",
-      Level: item.educationLevel ?? "",
-      Degree: item.degree ? `${item.degree} ${item.field ? item.field : ""}` : "",
-      Field: item.field ?? "-",
-    }));
+    const Education = educations.length > 0
+      ? educations.map((item) => ({
+        Institute: item.institute,
+        Start:
+          item.startDate == null
+            ? ""
+            : Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString()),
+        End:
+          item.endDate == null
+            ? ""
+            : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
+        Date:
+          item.startDate && item.endDate
+            ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
+            : "",
+        Level: item.educationLevel ?? "",
+        Degree: item.degree ? `${item.degree} ${item.field ? item.field : ""}` : "",
+        Field: item.field ?? "-",
+      }))
+      : [{
+        Institute: "-",
+        Start: "-",
+        End: "-",
+        Date: "-",
+        Level: "-",
+        Degree: "-",
+        Field: "-",
+      }];
     const salarys = await this.salaryRepository.find({
       select: [
         "date",
@@ -524,22 +557,36 @@ export class ProfileEmployeeController extends Controller {
       order: { order: "ASC" }
     });
 
-    const Salary = salarys.map((item) => ({
-      SalaryDate: item.date ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.date)) : null,
-      Position: item.position != null ? Extension.ToThaiNumber(item.position) : null,
-      PosNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : null,
-      Salary: item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
-      Rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
-      RefAll: item.templateDoc ? Extension.ToThaiNumber(item.templateDoc) : null,
-      PositionType: item.positionType ?? null,
-      PositionLevel: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
-      PositionAmount:
-        item.positionSalaryAmount == null
-          ? null
-          : Extension.ToThaiNumber(item.positionSalaryAmount.toLocaleString()),
-      FullName: `${profiles?.prefix} ${profiles?.firstName} ${profiles?.lastName}`,
-      OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
-    }));
+    const Salary = salarys.length > 0
+      ? salarys.map((item) => ({
+        SalaryDate: item.date ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.date)) : null,
+        Position: item.position != null ? Extension.ToThaiNumber(item.position) : null,
+        PosNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : null,
+        Salary: item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
+        Rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
+        RefAll: item.templateDoc ? Extension.ToThaiNumber(item.templateDoc) : null,
+        PositionLevel: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
+        PositionType: item.positionType ?? null,
+        PositionAmount:
+          item.positionSalaryAmount == null
+            ? null
+            : Extension.ToThaiNumber(item.positionSalaryAmount.toLocaleString()),
+        FullName: `${profiles?.prefix}${profiles?.firstName} ${profiles?.lastName}`,
+        OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
+      }))
+      : [{
+        SalaryDate: "-",
+        Position: "-",
+        PosNo: "-",
+        Salary: "-",
+        Rank: "-",
+        RefAll: "-",
+        PositionLevel: "-",
+        PositionType: "-",
+        PositionAmount: "-",
+        FullName: "-",
+        OcFullPath: "-",
+      }];
 
     const insignias = await this.profileInsigniaRepo.find({
       relations: {
@@ -550,36 +597,56 @@ export class ProfileEmployeeController extends Controller {
       where: { profileEmployeeId: id },
       order: { receiveDate: "ASC" },
     });
-    const Insignia = insignias.map((item) => ({
-      ReceiveDate: item.receiveDate
-        ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.receiveDate))
-        : "",
-      InsigniaName: item.insignia.name,
-      InsigniaShortName: item.insignia.shortName,
-      InsigniaTypeName: item.insignia.insigniaType.name,
-      No: item.no ? Extension.ToThaiNumber(item.no) : "",
-      Issue: item.issue ? item.issue : "",
-      VolumeNo: item.volumeNo ? Extension.ToThaiNumber(item.volumeNo) : "",
-      Volume: item.volume ? Extension.ToThaiNumber(item.volume) : "",
-      Section: item.section ? Extension.ToThaiNumber(item.section) : "",
-      Page: item.page ? Extension.ToThaiNumber(item.page) : "",
-      RefCommandDate: item.refCommandDate
-        ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.refCommandDate))
-        : "",
-    }));
+    const Insignia = insignias.length > 0
+      ? insignias.map((item) => ({
+        ReceiveDate: item.receiveDate
+          ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.receiveDate))
+          : "",
+        InsigniaName: item.insignia.name,
+        InsigniaShortName: item.insignia.shortName,
+        InsigniaTypeName: item.insignia.insigniaType.name,
+        No: item.no ? Extension.ToThaiNumber(item.no) : "",
+        Issue: item.issue ? item.issue : "",
+        VolumeNo: item.volumeNo ? Extension.ToThaiNumber(item.volumeNo) : "",
+        Volume: item.volume ? Extension.ToThaiNumber(item.volume) : "",
+        Section: item.section ? Extension.ToThaiNumber(item.section) : "",
+        Page: item.page ? Extension.ToThaiNumber(item.page) : "",
+        RefCommandDate: item.refCommandDate
+          ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.refCommandDate))
+          : "",
+      }))
+      : [{
+        ReceiveDate: "-",
+        InsigniaName: "-",
+        InsigniaShortName: "-",
+        InsigniaTypeName: "-",
+        No: "-",
+        Issue: "-",
+        VolumeNo: "-",
+        Volume: "-",
+        Section: "-",
+        Page: "-",
+        RefCommandDate: "-",
+      }];
 
     const leaves = await this.profileLeaveRepository.find({
       relations: { leaveType: true },
       where: { profileEmployeeId: id },
       order: { dateLeaveStart: "ASC" },
     });
-    const Leave = leaves.map((item) => ({
-      LeaveTypeName: item.leaveType.name,
-      DateLeaveStart: item.dateLeaveStart
-        ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart))
-        : "",
-      LeaveDays: item.leaveDays ? Extension.ToThaiNumber(item.leaveDays.toString()) : "",
-    }));
+    const Leave = leaves.length > 0
+      ? leaves.map((item) => ({
+        LeaveTypeName: item.leaveType.name,
+        DateLeaveStart: item.dateLeaveStart
+          ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart))
+          : "",
+        LeaveDays: item.leaveDays ? Extension.ToThaiNumber(item.leaveDays.toString()) : "",
+      }))
+      : [{
+        LeaveTypeName: "-",
+        DateLeaveStart: "-",
+        LeaveDays: "-",
+      }];
 
     return new HttpSuccess({
       Profile: [Profile],