From 442ce20d8069426ec2283210d43fbd154769e38a Mon Sep 17 00:00:00 2001
From: Adisak <adisak@frappet.com>
Date: Fri, 22 May 2026 13:33:22 +0700
Subject: [PATCH] #1588 and performance

---
 src/controllers/ProfileController.ts         |    2 +-
 src/controllers/ProfileEmployeeController.ts | 1871 +++++++++---------
 src/services/ProfileLeaveService.ts          |  507 +++--
 3 files changed, 1225 insertions(+), 1155 deletions(-)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 0e5abf92..2b626697 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -6300,7 +6300,7 @@ export class ProfileController extends Controller {
     @Query() sortBy: string = "profile.dateLeave",
     @Query() sort: "ASC" | "DESC" = "ASC",
   ) {
-    let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_OFFICER");
+    let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_RETIRE_OFFICER");
 
     const { data, total } = await this.profileLeaveService.getLeaveOfficer(request, {
       page,
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index e888a6ae..14104100 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -196,7 +196,7 @@ export class ProfileEmployeeController extends Controller {
           },
         });
         ImgUrl = response_.data.downloadUrl;
-      } catch {}
+      } catch { }
     }
     const province = await this.provinceRepository.findOneBy({
       id: profile.registrationProvinceId,
@@ -208,36 +208,36 @@ export class ProfileEmployeeController extends Controller {
 
     const root =
       profile.current_holders == null ||
-      profile.current_holders.length == 0 ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profile.current_holders.length == 0 ||
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgRoot;
 
     const child1 =
       profile.current_holders == null ||
-      profile.current_holders.length == 0 ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profile.current_holders.length == 0 ||
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild1;
 
     const child2 =
       profile.current_holders == null ||
-      profile.current_holders.length == 0 ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profile.current_holders.length == 0 ||
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild2;
 
     const child3 =
       profile.current_holders == null ||
-      profile.current_holders.length == 0 ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profile.current_holders.length == 0 ||
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild3;
 
     const child4 =
       profile.current_holders == null ||
-      profile.current_holders.length == 0 ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profile.current_holders.length == 0 ||
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild4;
 
@@ -286,38 +286,38 @@ export class ProfileEmployeeController extends Controller {
     const salarys =
       salary_raw.length > 1
         ? salary_raw.slice(1).map((item) => ({
-            date: item.commandDateAffect
-              ? Extension.ToThaiNumber(Extension.ToThaiShortDate(item.commandDateAffect))
-              : null,
-            position: Extension.ToThaiNumber(
-              Extension.ToThaiNumber(
-                `${item.positionName != null ? item.positionName : "-"} ${item.positionType == null ? item.positionCee ?? "" : (item.positionType == "อำนวยการ" || item.positionType == "บริหาร" ? item.positionType : "") + item.positionLevel}`,
-              ),
+          date: item.commandDateAffect
+            ? Extension.ToThaiNumber(Extension.ToThaiShortDate(item.commandDateAffect))
+            : null,
+          position: Extension.ToThaiNumber(
+            Extension.ToThaiNumber(
+              `${item.positionName != null ? item.positionName : "-"} ${item.positionType == null ? item.positionCee ?? "" : (item.positionType == "อำนวยการ" || item.positionType == "บริหาร" ? item.positionType : "") + item.positionLevel}`,
             ),
-            posNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : "",
-            orgRoot: item.orgRoot != null ? Extension.ToThaiNumber(item.orgRoot) : "",
-            orgChild1: item.orgChild1 != null ? Extension.ToThaiNumber(item.orgChild1) : "",
-            orgChild2: item.orgChild2 != null ? Extension.ToThaiNumber(item.orgChild2) : "",
-            orgChild3: item.orgChild3 != null ? Extension.ToThaiNumber(item.orgChild3) : "",
-            orgChild4: item.orgChild4 != null ? Extension.ToThaiNumber(item.orgChild4) : "",
-            positionCee: item.positionCee != null ? Extension.ToThaiNumber(item.positionCee) : "",
-            positionExecutive:
-              item.positionExecutive != null ? Extension.ToThaiNumber(item.positionExecutive) : "",
-          }))
+          ),
+          posNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : "",
+          orgRoot: item.orgRoot != null ? Extension.ToThaiNumber(item.orgRoot) : "",
+          orgChild1: item.orgChild1 != null ? Extension.ToThaiNumber(item.orgChild1) : "",
+          orgChild2: item.orgChild2 != null ? Extension.ToThaiNumber(item.orgChild2) : "",
+          orgChild3: item.orgChild3 != null ? Extension.ToThaiNumber(item.orgChild3) : "",
+          orgChild4: item.orgChild4 != null ? Extension.ToThaiNumber(item.orgChild4) : "",
+          positionCee: item.positionCee != null ? Extension.ToThaiNumber(item.positionCee) : "",
+          positionExecutive:
+            item.positionExecutive != null ? Extension.ToThaiNumber(item.positionExecutive) : "",
+        }))
         : [
-            {
-              date: "-",
-              position: "-",
-              posNo: "-",
-              orgRoot: null,
-              orgChild1: null,
-              orgChild2: null,
-              orgChild3: null,
-              orgChild4: null,
-              positionCee: null,
-              positionExecutive: null,
-            },
-          ];
+          {
+            date: "-",
+            position: "-",
+            posNo: "-",
+            orgRoot: null,
+            orgChild1: null,
+            orgChild2: null,
+            orgChild3: null,
+            orgChild4: null,
+            positionCee: null,
+            positionExecutive: null,
+          },
+        ];
 
     const educations = await this.profileEducationRepo.find({
       select: [
@@ -335,20 +335,20 @@ export class ProfileEmployeeController extends Controller {
     const Education =
       educations && educations.length > 0
         ? educations.map((item) => ({
-            institute: item.institute ? item.institute : "-",
-            date:
-              item.startDate && item.endDate
-                ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
-                : "-",
-            degree: item.degree && item.field ? `${item.degree} ${item.field}` : "-",
-          }))
+          institute: item.institute ? item.institute : "-",
+          date:
+            item.startDate && item.endDate
+              ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
+              : "-",
+          degree: item.degree && item.field ? `${item.degree} ${item.field}` : "-",
+        }))
         : [
-            {
-              institute: "-",
-              date: "-",
-              degree: "-",
-            },
-          ];
+          {
+            institute: "-",
+            date: "-",
+            degree: "-",
+          },
+        ];
 
     const mapData = {
       // Id: profile.id,
@@ -386,10 +386,10 @@ export class ProfileEmployeeController extends Controller {
       position:
         salary_raw.length > 0 && salary_raw[0].positionName != null
           ? Extension.ToThaiNumber(
-              Extension.ToThaiNumber(
-                `${salary_raw[0].positionName != null ? salary_raw[0].positionName : "-"} ${salary_raw[0].positionType == null ? salary_raw[0].positionCee ?? "" : (salary_raw[0].positionType == "อำนวยการ" || salary_raw[0].positionType == "บริหาร" ? salary_raw[0].positionType : "") + salary_raw[0].positionLevel}`,
-              ),
-            )
+            Extension.ToThaiNumber(
+              `${salary_raw[0].positionName != null ? salary_raw[0].positionName : "-"} ${salary_raw[0].positionType == null ? salary_raw[0].positionCee ?? "" : (salary_raw[0].positionType == "อำนวยการ" || salary_raw[0].positionType == "บริหาร" ? salary_raw[0].positionType : "") + salary_raw[0].positionLevel}`,
+            ),
+          )
           : "",
       positionCee:
         salary_raw.length > 0 && salary_raw[0].positionCee != null
@@ -399,27 +399,22 @@ export class ProfileEmployeeController extends Controller {
         salary_raw.length > 0 && salary_raw[0].positionExecutive != null
           ? Extension.ToThaiNumber(Extension.ToThaiNumber(salary_raw[0].positionExecutive))
           : "",
-      org: `${
-        salary_raw.length > 0 && salary_raw[0].orgChild4 && salary_raw[0].orgChild4 != "-"
+      org: `${salary_raw.length > 0 && salary_raw[0].orgChild4 && salary_raw[0].orgChild4 != "-"
           ? Extension.ToThaiNumber(Extension.ToThaiNumber(salary_raw[0].orgChild4)) + " "
           : ""
-      }${
-        salary_raw.length > 0 && salary_raw[0].orgChild3 && salary_raw[0].orgChild3 != "-"
+        }${salary_raw.length > 0 && salary_raw[0].orgChild3 && salary_raw[0].orgChild3 != "-"
           ? Extension.ToThaiNumber(Extension.ToThaiNumber(salary_raw[0].orgChild3)) + " "
           : ""
-      }${
-        salary_raw.length > 0 && salary_raw[0].orgChild2 && salary_raw[0].orgChild2 != "-"
+        }${salary_raw.length > 0 && salary_raw[0].orgChild2 && salary_raw[0].orgChild2 != "-"
           ? Extension.ToThaiNumber(Extension.ToThaiNumber(salary_raw[0].orgChild2)) + " "
           : ""
-      }${
-        salary_raw.length > 0 && salary_raw[0].orgChild1 && salary_raw[0].orgChild1 != "-"
+        }${salary_raw.length > 0 && salary_raw[0].orgChild1 && salary_raw[0].orgChild1 != "-"
           ? Extension.ToThaiNumber(Extension.ToThaiNumber(salary_raw[0].orgChild1)) + " "
           : ""
-      }${
-        salary_raw.length > 0 && salary_raw[0].orgRoot && salary_raw[0].orgRoot != "-"
+        }${salary_raw.length > 0 && salary_raw[0].orgRoot && salary_raw[0].orgRoot != "-"
           ? Extension.ToThaiNumber(Extension.ToThaiNumber(salary_raw[0].orgRoot))
           : ""
-      }`,
+        }`,
       ocFullPath:
         (_child4 == null ? "" : _child4 + "\n") +
         (_child3 == null ? "" : _child3 + "\n") +
@@ -488,7 +483,7 @@ export class ProfileEmployeeController extends Controller {
                 },
               });
               _ImgUrl[i] = response_.data.downloadUrl;
-            } catch {}
+            } catch { }
           }
         }),
       );
@@ -502,7 +497,7 @@ export class ProfileEmployeeController extends Controller {
           },
         });
         ImgUrl = response_.data.downloadUrl;
-      } catch {}
+      } catch { }
     }
     const profileOc = await this.profileRepo.findOne({
       relations: [
@@ -541,36 +536,36 @@ export class ProfileEmployeeController extends Controller {
 
     const root =
       profileOc.current_holders == null ||
-      profileOc.current_holders.length == 0 ||
-      profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profileOc.current_holders.length == 0 ||
+        profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgRoot;
 
     const child1 =
       profileOc.current_holders == null ||
-      profileOc.current_holders.length == 0 ||
-      profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profileOc.current_holders.length == 0 ||
+        profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild1;
 
     const child2 =
       profileOc.current_holders == null ||
-      profileOc.current_holders.length == 0 ||
-      profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profileOc.current_holders.length == 0 ||
+        profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild2;
 
     const child3 =
       profileOc.current_holders == null ||
-      profileOc.current_holders.length == 0 ||
-      profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profileOc.current_holders.length == 0 ||
+        profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild3;
 
     const child4 =
       profileOc.current_holders == null ||
-      profileOc.current_holders.length == 0 ||
-      profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profileOc.current_holders.length == 0 ||
+        profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profileOc.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild4;
 
@@ -589,19 +584,19 @@ export class ProfileEmployeeController extends Controller {
     const certs =
       cert_raw.length > 0
         ? cert_raw.slice(-2).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: 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: "-",
-            },
-          ];
+          {
+            CertificateType: "-",
+            Issuer: "-",
+            CertificateNo: "-",
+            IssueDate: "-",
+          },
+        ];
     const training_raw = await this.trainingRepository.find({
       select: ["startDate", "endDate", "place", "department", "isDeleted"],
       where: { profileEmployeeId: id, isDeleted: false },
@@ -610,34 +605,34 @@ export class ProfileEmployeeController extends Controller {
     const trainings =
       training_raw.length > 0
         ? training_raw.slice(-2).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: 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: "-",
-            },
-          ];
+          {
+            Institute: "-",
+            Start: "-",
+            End: "-",
+            Date: "-",
+            Level: "-",
+            Degree: "-",
+            Field: "-",
+          },
+        ];
 
     const discipline_raw = await this.disciplineRepository.find({
       select: ["refCommandDate", "refCommandNo", "detail", "isDeleted"],
@@ -647,19 +642,19 @@ export class ProfileEmployeeController extends Controller {
     const disciplines =
       discipline_raw.length > 0
         ? discipline_raw.slice(-2).map((item) => ({
-            DisciplineYear:
-              Extension.ToThaiNumber(new Date(item.refCommandDate).getFullYear().toString()) ??
-              null,
-            DisciplineDetail: item.detail ?? null,
-            RefNo: item.refCommandNo ? Extension.ToThaiNumber(item.refCommandNo) : null,
-          }))
+          DisciplineYear:
+            Extension.ToThaiNumber(new Date(item.refCommandDate).getFullYear().toString()) ??
+            null,
+          DisciplineDetail: item.detail ?? null,
+          RefNo: item.refCommandNo ? Extension.ToThaiNumber(item.refCommandNo) : null,
+        }))
         : [
-            {
-              DisciplineYear: "-",
-              DisciplineDetail: "-",
-              RefNo: "-",
-            },
-          ];
+          {
+            DisciplineYear: "-",
+            DisciplineDetail: "-",
+            RefNo: "-",
+          },
+        ];
 
     const education_raw = await this.profileEducationRepo.find({
       select: [
@@ -678,34 +673,34 @@ export class ProfileEmployeeController extends Controller {
     const educations =
       education_raw.length > 0
         ? education_raw.slice(-2).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: 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: "-",
-            },
-          ];
+          {
+            Institute: "-",
+            Start: "-",
+            End: "-",
+            Date: "-",
+            Level: "-",
+            Degree: "-",
+            Field: "-",
+          },
+        ];
     const salary_raw = await this.salaryRepo.find({
       select: [
         "commandDateAffect",
@@ -725,45 +720,45 @@ export class ProfileEmployeeController extends Controller {
     const salarys =
       salary_raw.length > 0
         ? salary_raw.map((item) => ({
-            SalaryDate: item.commandDateAffect
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateAffect))
-              : null,
-            Position: item.positionName != null ? Extension.ToThaiNumber(item.positionName) : 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.remark ? Extension.ToThaiNumber(item.remark) : 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 == null ? "" : _child4 + "\n") +
-              (_child3 == null ? "" : _child3 + "\n") +
-              (_child2 == null ? "" : _child2 + "\n") +
-              (_child1 == null ? "" : _child1 + "\n") +
-              (_root == null ? "" : _root),
-          }))
+          SalaryDate: item.commandDateAffect
+            ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateAffect))
+            : null,
+          Position: item.positionName != null ? Extension.ToThaiNumber(item.positionName) : 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.remark ? Extension.ToThaiNumber(item.remark) : 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 == null ? "" : _child4 + "\n") +
+            (_child3 == null ? "" : _child3 + "\n") +
+            (_child2 == null ? "" : _child2 + "\n") +
+            (_child1 == null ? "" : _child1 + "\n") +
+            (_root == null ? "" : _root),
+        }))
         : [
-            {
-              SalaryDate: "-",
-              Position: "-",
-              PosNo: "-",
-              Salary: "-",
-              Rank: "-",
-              RefAll: "-",
-              PositionLevel: "-",
-              PositionType: "-",
-              PositionAmount: "-",
-              FullName: "-",
-              OcFullPath: "-",
-            },
-          ];
+          {
+            SalaryDate: "-",
+            Position: "-",
+            PosNo: "-",
+            Salary: "-",
+            Rank: "-",
+            RefAll: "-",
+            PositionLevel: "-",
+            PositionType: "-",
+            PositionAmount: "-",
+            FullName: "-",
+            OcFullPath: "-",
+          },
+        ];
 
     const insignia_raw = await this.profileInsigniaRepo.find({
       relations: {
@@ -777,37 +772,37 @@ export class ProfileEmployeeController extends Controller {
     const insignias =
       insignia_raw.length > 0
         ? insignia_raw.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: 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: "-",
-            },
-          ];
+          {
+            ReceiveDate: "-",
+            InsigniaName: "-",
+            InsigniaShortName: "-",
+            InsigniaTypeName: "-",
+            No: "-",
+            Issue: "-",
+            VolumeNo: "-",
+            Volume: "-",
+            Section: "-",
+            Page: "-",
+            RefCommandDate: "-",
+          },
+        ];
 
     const leave_raw = await this.profileLeaveRepository
       .createQueryBuilder("profileLeave")
@@ -897,20 +892,20 @@ export class ProfileEmployeeController extends Controller {
         profiles.citizenId != null ? Extension.ToThaiNumber(profiles.citizenId.toString()) : "",
       fatherFullName:
         profileFamilyFather?.fatherPrefix ||
-        profileFamilyFather?.fatherFirstName ||
-        profileFamilyFather?.fatherLastName
+          profileFamilyFather?.fatherFirstName ||
+          profileFamilyFather?.fatherLastName
           ? `${profileFamilyFather?.fatherPrefix ?? ""}${profileFamilyFather?.fatherFirstName ?? ""} ${profileFamilyFather?.fatherLastName ?? ""}`.trim()
           : null,
       motherFullName:
         profileFamilyMother?.motherPrefix ||
-        profileFamilyMother?.motherFirstName ||
-        profileFamilyMother?.motherLastName
+          profileFamilyMother?.motherFirstName ||
+          profileFamilyMother?.motherLastName
           ? `${profileFamilyMother?.motherPrefix ?? ""}${profileFamilyMother?.motherFirstName ?? ""} ${profileFamilyMother?.motherLastName ?? ""}`.trim()
           : null,
       coupleFullName:
         profileFamilyCouple?.couplePrefix ||
-        profileFamilyCouple?.coupleFirstName ||
-        profileFamilyCouple?.coupleLastNameOld
+          profileFamilyCouple?.coupleFirstName ||
+          profileFamilyCouple?.coupleLastNameOld
           ? `${profileFamilyCouple?.couplePrefix ?? ""}${profileFamilyCouple?.coupleFirstName ?? ""} ${profileFamilyCouple?.coupleLastName ?? ""}`.trim()
           : null,
       coupleLastNameOld: profileFamilyCouple?.coupleLastNameOld ?? null,
@@ -1028,7 +1023,7 @@ export class ProfileEmployeeController extends Controller {
                 },
               });
               _ImgUrl[i] = response_.data.downloadUrl;
-            } catch {}
+            } catch { }
           }
         }),
       );
@@ -1042,7 +1037,7 @@ export class ProfileEmployeeController extends Controller {
           },
         });
         ImgUrl = response_.data.downloadUrl;
-      } catch {}
+      } catch { }
     }
 
     const orgRevision = await this.orgRevisionRepo.findOne({
@@ -1076,36 +1071,36 @@ export class ProfileEmployeeController extends Controller {
 
     const root =
       profiles.current_holders == null ||
-      profiles.current_holders.length == 0 ||
-      profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profiles.current_holders.length == 0 ||
+        profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgRoot;
 
     const child1 =
       profiles.current_holders == null ||
-      profiles.current_holders.length == 0 ||
-      profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profiles.current_holders.length == 0 ||
+        profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild1;
 
     const child2 =
       profiles.current_holders == null ||
-      profiles.current_holders.length == 0 ||
-      profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profiles.current_holders.length == 0 ||
+        profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild2;
 
     const child3 =
       profiles.current_holders == null ||
-      profiles.current_holders.length == 0 ||
-      profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profiles.current_holders.length == 0 ||
+        profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild3;
 
     const child4 =
       profiles.current_holders == null ||
-      profiles.current_holders.length == 0 ||
-      profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
+        profiles.current_holders.length == 0 ||
+        profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) == null
         ? null
         : profiles.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild4;
 
@@ -1131,31 +1126,31 @@ export class ProfileEmployeeController extends Controller {
     const certs =
       cert_raw.length > 0
         ? cert_raw.map((item) => ({
-            certificateType: item.certificateType ?? null,
-            issuer: item.issuer ?? null,
-            certificateNo: item.certificateNo ? Extension.ToThaiNumber(item.certificateNo) : null,
-            detail: Extension.ToThaiNumber(
-              `${item.issuer ?? ""} ${item.certificateNo ?? ""}`.trim(),
-            ),
-            issueToExpireDate: item.issueDate
-              ? item.expireDate
-                ? Extension.ToThaiNumber(
-                    `${Extension.ToThaiFullDate2(item.issueDate)} - ${Extension.ToThaiFullDate2(item.expireDate)}`,
-                  )
-                : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate))
-              : item.expireDate
-                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate))
-                : "",
-          }))
+          certificateType: item.certificateType ?? null,
+          issuer: item.issuer ?? null,
+          certificateNo: item.certificateNo ? Extension.ToThaiNumber(item.certificateNo) : null,
+          detail: Extension.ToThaiNumber(
+            `${item.issuer ?? ""} ${item.certificateNo ?? ""}`.trim(),
+          ),
+          issueToExpireDate: item.issueDate
+            ? item.expireDate
+              ? Extension.ToThaiNumber(
+                `${Extension.ToThaiFullDate2(item.issueDate)} - ${Extension.ToThaiFullDate2(item.expireDate)}`,
+              )
+              : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate))
+            : item.expireDate
+              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate))
+              : "",
+        }))
         : [
-            {
-              certificateType: "",
-              issuer: "",
-              certificateNo: "",
-              detail: "",
-              issueToExpireDate: "",
-            },
-          ];
+          {
+            certificateType: "",
+            issuer: "",
+            certificateNo: "",
+            detail: "",
+            issueToExpireDate: "",
+          },
+        ];
     const training_raw = await this.trainingRepository.find({
       select: ["place", "department", "name", "duration", "isDeleted", "startDate", "endDate"],
       where: { profileEmployeeId: id, isDeleted: false },
@@ -1164,23 +1159,23 @@ export class ProfileEmployeeController extends Controller {
     const trainings =
       training_raw.length > 0
         ? training_raw.map((item) => ({
-            institute: item.department ?? "",
-            degree: item.name ? Extension.ToThaiNumber(item.name) : "",
-            place: item.place ? Extension.ToThaiNumber(item.place) : "",
-            duration: item.duration ? Extension.ToThaiNumber(item.duration) : "",
-            date: Extension.ToThaiNumber(
-              `${Extension.ToThaiFullDate2(item.startDate)} - ${Extension.ToThaiFullDate2(item.endDate)}`,
-            ),
-          }))
+          institute: item.department ?? "",
+          degree: item.name ? Extension.ToThaiNumber(item.name) : "",
+          place: item.place ? Extension.ToThaiNumber(item.place) : "",
+          duration: item.duration ? Extension.ToThaiNumber(item.duration) : "",
+          date: Extension.ToThaiNumber(
+            `${Extension.ToThaiFullDate2(item.startDate)} - ${Extension.ToThaiFullDate2(item.endDate)}`,
+          ),
+        }))
         : [
-            {
-              institute: "",
-              degree: "",
-              place: "",
-              duration: "",
-              date: "",
-            },
-          ];
+          {
+            institute: "",
+            degree: "",
+            place: "",
+            duration: "",
+            date: "",
+          },
+        ];
 
     const discipline_raw = await this.disciplineRepository.find({
       select: ["refCommandDate", "refCommandNo", "detail", "level", "isDeleted"],
@@ -1190,21 +1185,21 @@ export class ProfileEmployeeController extends Controller {
     const disciplines =
       discipline_raw.length > 0
         ? discipline_raw.map((item) => ({
-            disciplineYear: item.refCommandDate
-              ? Extension.ToThaiNumber(Extension.ToThaiShortYear(new Date(item.refCommandDate)))
-              : null,
-            disciplineDetail: item.detail ?? null,
-            refNo: Extension.ToThaiNumber(item.refCommandNo) ?? null,
-            level: item.level ?? "",
-          }))
+          disciplineYear: item.refCommandDate
+            ? Extension.ToThaiNumber(Extension.ToThaiShortYear(new Date(item.refCommandDate)))
+            : null,
+          disciplineDetail: item.detail ?? null,
+          refNo: Extension.ToThaiNumber(item.refCommandNo) ?? null,
+          level: item.level ?? "",
+        }))
         : [
-            {
-              disciplineYear: "",
-              disciplineDetail: "",
-              refNo: "",
-              level: "",
-            },
-          ];
+          {
+            disciplineYear: "",
+            disciplineDetail: "",
+            refNo: "",
+            level: "",
+          },
+        ];
 
     const education_raw = await this.profileEducationRepo
       .createQueryBuilder("education")
@@ -1216,21 +1211,21 @@ export class ProfileEmployeeController extends Controller {
     const educations =
       education_raw.length > 0
         ? education_raw.map((item) => ({
-            institute: item.institute,
-            date: item.isDate
-              ? `${item.startDate ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate)) : ""} - ${item.endDate ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate)) : ""}`
-              : `${item.startDate ? Extension.ToThaiNumber(Extension.ToThaiShortYear(new Date(item.startDate))) : ""} - ${item.endDate ? Extension.ToThaiNumber(Extension.ToThaiShortYear(new Date(item.endDate))) : ""}`,
-            degree: `${item.degree ?? ""} ${item.field ?? ""}`.trim(),
-            level: item.educationLevel,
-          }))
+          institute: item.institute,
+          date: item.isDate
+            ? `${item.startDate ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate)) : ""} - ${item.endDate ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate)) : ""}`
+            : `${item.startDate ? Extension.ToThaiNumber(Extension.ToThaiShortYear(new Date(item.startDate))) : ""} - ${item.endDate ? Extension.ToThaiNumber(Extension.ToThaiShortYear(new Date(item.endDate))) : ""}`,
+          degree: `${item.degree ?? ""} ${item.field ?? ""}`.trim(),
+          level: item.educationLevel,
+        }))
         : [
-            {
-              institute: "",
-              date: "",
-              degree: "",
-              level: "",
-            },
-          ];
+          {
+            institute: "",
+            date: "",
+            degree: "",
+            level: "",
+          },
+        ];
     const salary_raw = await this.salaryRepo.find({
       select: [
         "commandName",
@@ -1258,58 +1253,58 @@ export class ProfileEmployeeController extends Controller {
     const salarys =
       salary_raw.length > 0
         ? salary_raw.map((item) => ({
-            commandName: item.commandName ?? "",
-            salaryDate: item.commandDateAffect
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateAffect))
+          commandName: item.commandName ?? "",
+          salaryDate: item.commandDateAffect
+            ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateAffect))
+            : null,
+          position: item.positionName != null ? Extension.ToThaiNumber(item.positionName) : null,
+          posNo:
+            item.posNoAbb && item.posNo
+              ? Extension.ToThaiNumber(`${item.posNoAbb}${item.posNo}`)
               : null,
-            position: item.positionName != null ? Extension.ToThaiNumber(item.positionName) : null,
-            posNo:
-              item.posNoAbb && item.posNo
-                ? Extension.ToThaiNumber(`${item.posNoAbb}${item.posNo}`)
-                : null,
-            salary:
-              item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
-            special:
-              item.amountSpecial != null
-                ? Extension.ToThaiNumber(item.amountSpecial.toLocaleString())
-                : null,
-            rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
-            refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null,
-            positionLevel: item.positionLevel
-              ? Extension.ToThaiNumber(item.positionLevel)
-              : item.positionCee
-                ? Extension.ToThaiNumber(item.positionCee)
-                : null,
-            positionType: item.positionType ?? null,
-            positionAmount:
-              item.positionSalaryAmount == null
-                ? null
-                : Extension.ToThaiNumber(item.positionSalaryAmount.toLocaleString()),
-            fullName: `${profiles?.prefix}${profiles?.firstName} ${profiles?.lastName}`,
-            ocFullPath:
-              (_child4 == null ? "" : _child4 + "\n") +
-              (_child3 == null ? "" : _child3 + "\n") +
-              (_child2 == null ? "" : _child2 + "\n") +
-              (_child1 == null ? "" : _child1 + "\n") +
-              (_root == null ? "" : _root),
-          }))
+          salary:
+            item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
+          special:
+            item.amountSpecial != null
+              ? Extension.ToThaiNumber(item.amountSpecial.toLocaleString())
+              : null,
+          rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
+          refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null,
+          positionLevel: item.positionLevel
+            ? Extension.ToThaiNumber(item.positionLevel)
+            : item.positionCee
+              ? Extension.ToThaiNumber(item.positionCee)
+              : null,
+          positionType: item.positionType ?? null,
+          positionAmount:
+            item.positionSalaryAmount == null
+              ? null
+              : Extension.ToThaiNumber(item.positionSalaryAmount.toLocaleString()),
+          fullName: `${profiles?.prefix}${profiles?.firstName} ${profiles?.lastName}`,
+          ocFullPath:
+            (_child4 == null ? "" : _child4 + "\n") +
+            (_child3 == null ? "" : _child3 + "\n") +
+            (_child2 == null ? "" : _child2 + "\n") +
+            (_child1 == null ? "" : _child1 + "\n") +
+            (_root == null ? "" : _root),
+        }))
         : [
-            {
-              commandName: "",
-              salaryDate: "",
-              position: "",
-              posNo: "",
-              salary: "",
-              special: "",
-              rank: "",
-              refAll: "",
-              positionLevel: "",
-              positionType: "",
-              positionAmount: "",
-              fullName: "",
-              ocFullPath: "",
-            },
-          ];
+          {
+            commandName: "",
+            salaryDate: "",
+            position: "",
+            posNo: "",
+            salary: "",
+            special: "",
+            rank: "",
+            refAll: "",
+            positionLevel: "",
+            positionType: "",
+            positionAmount: "",
+            fullName: "",
+            ocFullPath: "",
+          },
+        ];
 
     const insignia_raw = await this.profileInsigniaRepo.find({
       select: [
@@ -1335,38 +1330,38 @@ export class ProfileEmployeeController extends Controller {
     const insignias =
       insignia_raw.length > 0
         ? insignia_raw.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 ? Extension.ToThaiNumber(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))
-              : "",
-            note: item.note ? Extension.ToThaiNumber(item.note) : "",
-          }))
+          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 ? Extension.ToThaiNumber(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))
+            : "",
+          note: item.note ? Extension.ToThaiNumber(item.note) : "",
+        }))
         : [
-            {
-              receiveDate: "",
-              insigniaName: "",
-              insigniaShortName: "",
-              insigniaTypeName: "",
-              no: "",
-              issue: "",
-              volumeNo: "",
-              volume: "",
-              section: "",
-              page: "",
-              refCommandDate: "",
-            },
-          ];
+          {
+            receiveDate: "",
+            insigniaName: "",
+            insigniaShortName: "",
+            insigniaTypeName: "",
+            no: "",
+            issue: "",
+            volumeNo: "",
+            volume: "",
+            section: "",
+            page: "",
+            refCommandDate: "",
+          },
+        ];
 
     const leave_raw = await this.profileLeaveRepository
       .createQueryBuilder("profileLeave")
@@ -1504,62 +1499,62 @@ export class ProfileEmployeeController extends Controller {
     const leaves2 =
       leave2_raw.length > 0
         ? leave2_raw.map((item) => {
-            const leaveTypeCode = item.code ? item.code.trim().toUpperCase() : "";
+          const leaveTypeCode = item.code ? item.code.trim().toUpperCase() : "";
 
-            // ข้อที่ 1: LV-008 ให้ใช้ leaveSubTypeName (ประเภทย่อย) แทน name
-            const displayType =
-              leaveTypeCode === "LV-008" && item.leaveSubTypeName
-                ? item.leaveSubTypeName
-                : item.name || "-";
+          // ข้อที่ 1: LV-008 ให้ใช้ leaveSubTypeName (ประเภทย่อย) แทน name
+          const displayType =
+            leaveTypeCode === "LV-008" && item.leaveSubTypeName
+              ? item.leaveSubTypeName
+              : item.name || "-";
 
-            // ข้อที่ 2: แสดง reason ก่อนเสมอ ถ้ามี coupleDayLevelCountry ค่อยแสดงประเทศ
-            const displayReason = item.coupleDayLevelCountry
-              ? `${item.reason || ""} ลาไปประเทศ ${item.coupleDayLevelCountry}`.trim()
-              : item.reason || "-";
+          // ข้อที่ 2: แสดง reason ก่อนเสมอ ถ้ามี coupleDayLevelCountry ค่อยแสดงประเทศ
+          const displayReason = item.coupleDayLevelCountry
+            ? `${item.reason || ""} ลาไปประเทศ ${item.coupleDayLevelCountry}`.trim()
+            : item.reason || "-";
 
-            return {
-              date:
-                item.dateLeaveStart && item.dateLeaveEnd
-                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart)) +
-                    " - " +
-                    Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveEnd))
-                  : "-",
-              type: displayType,
-              leaveDays: item.leaveDays ? Extension.ToThaiNumber(item.leaveDays.toString()) : "-",
-              reason: displayReason,
-            };
-          })
+          return {
+            date:
+              item.dateLeaveStart && item.dateLeaveEnd
+                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart)) +
+                " - " +
+                Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveEnd))
+                : "-",
+            type: displayType,
+            leaveDays: item.leaveDays ? Extension.ToThaiNumber(item.leaveDays.toString()) : "-",
+            reason: displayReason,
+          };
+        })
         : [
-            {
-              date: "",
-              type: "",
-              leaveDays: "",
-              reason: "",
-            },
-          ];
+          {
+            date: "",
+            type: "",
+            leaveDays: "",
+            reason: "",
+          },
+        ];
     const children_raw = await this.profileChildrenRepository.find({
       where: { profileEmployeeId: id, isDeleted: false },
     });
     const children =
       children_raw.length > 0
         ? children_raw.map((item, index) => ({
-            no: Extension.ToThaiNumber((index + 1).toString()),
-            childrenPrefix: item.childrenPrefix,
-            childrenFirstName: item.childrenFirstName,
-            childrenLastName: item.childrenLastName,
-            childrenFullName: `${item.childrenPrefix}${item.childrenFirstName} ${item.childrenLastName}`,
-            childrenLive: item.childrenLive == false ? "ถึงแก่กรรม" : "มีชีวิต",
-          }))
+          no: Extension.ToThaiNumber((index + 1).toString()),
+          childrenPrefix: item.childrenPrefix,
+          childrenFirstName: item.childrenFirstName,
+          childrenLastName: item.childrenLastName,
+          childrenFullName: `${item.childrenPrefix}${item.childrenFirstName} ${item.childrenLastName}`,
+          childrenLive: item.childrenLive == false ? "ถึงแก่กรรม" : "มีชีวิต",
+        }))
         : [
-            {
-              no: "",
-              childrenPrefix: "",
-              childrenFirstName: "",
-              childrenLastName: "",
-              childrenFullName: "",
-              childrenLive: "",
-            },
-          ];
+          {
+            no: "",
+            childrenPrefix: "",
+            childrenFirstName: "",
+            childrenLastName: "",
+            childrenFullName: "",
+            childrenLive: "",
+          },
+        ];
     const changeName_raw = await this.changeNameRepository.find({
       where: { profileEmployeeId: id, isDeleted: false },
       order: { createdAt: "ASC" },
@@ -1567,23 +1562,23 @@ export class ProfileEmployeeController extends Controller {
     const changeName =
       changeName_raw.length > 0
         ? changeName_raw.map((item) => ({
-            createdAt: item.createdAt
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.createdAt))
-              : null,
-            status: item.status,
-            prefix: item.prefix,
-            firstName: item.firstName,
-            lastName: item.lastName,
-          }))
+          createdAt: item.createdAt
+            ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.createdAt))
+            : null,
+          status: item.status,
+          prefix: item.prefix,
+          firstName: item.firstName,
+          lastName: item.lastName,
+        }))
         : [
-            {
-              createdAt: "",
-              status: "",
-              prefix: "",
-              firstName: "",
-              lastName: "",
-            },
-          ];
+          {
+            createdAt: "",
+            status: "",
+            prefix: "",
+            firstName: "",
+            lastName: "",
+          },
+        ];
 
     const profileHistory = await this.profileHistoryRepo.find({
       where: { profileEmployeeId: id },
@@ -1592,19 +1587,19 @@ export class ProfileEmployeeController extends Controller {
     const history =
       profileHistory.length > 0
         ? profileHistory.map((item) => ({
-            birthDateOld: item.birthDateOld
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.birthDateOld))
-              : "",
-            birthDate: item.birthDate
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.birthDate))
-              : "",
-          }))
+          birthDateOld: item.birthDateOld
+            ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.birthDateOld))
+            : "",
+          birthDate: item.birthDate
+            ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.birthDate))
+            : "",
+        }))
         : [
-            {
-              birthDateOld: "",
-              birthDate: "",
-            },
-          ];
+          {
+            birthDateOld: "",
+            birthDate: "",
+          },
+        ];
 
     const position_raw = await this.salaryRepo.find({
       where: [
@@ -1638,76 +1633,76 @@ export class ProfileEmployeeController extends Controller {
     const positionList =
       position_raw.length > 0
         ? await Promise.all(
-            position_raw.map(async (item, idx, arr) => {
-              const isLast = idx === arr.length - 1;
-              if (isLast) {
-                _commandDateAffect = item.commandDateAffect
-                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateAffect))
-                  : "";
-              }
-              const _code = item.commandCode ? Number(item.commandCode) : null;
-              if (_code != null) {
-                _commandName = await this.commandCodeRepository.findOne({
-                  select: { name: true, code: true },
-                  where: { code: _code },
-                });
-              }
-              const codeSitAbb = item.posNumCodeSitAbb ?? "-";
-              const commandNo =
-                item.commandNo && item.commandYear
-                  ? item.commandNo +
-                    "/" +
-                    (item.commandYear > 2500 ? item.commandYear : item.commandYear + 543)
-                  : "-";
-              const dateAffect = item.commandDateAffect
-                ? `${Extension.ToThaiFullDate2(item.commandDateAffect)}`
+          position_raw.map(async (item, idx, arr) => {
+            const isLast = idx === arr.length - 1;
+            if (isLast) {
+              _commandDateAffect = item.commandDateAffect
+                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateAffect))
+                : "";
+            }
+            const _code = item.commandCode ? Number(item.commandCode) : null;
+            if (_code != null) {
+              _commandName = await this.commandCodeRepository.findOne({
+                select: { name: true, code: true },
+                where: { code: _code },
+              });
+            }
+            const codeSitAbb = item.posNumCodeSitAbb ?? "-";
+            const commandNo =
+              item.commandNo && item.commandYear
+                ? item.commandNo +
+                "/" +
+                (item.commandYear > 2500 ? item.commandYear : item.commandYear + 543)
                 : "-";
-              return {
-                commandName:
-                  _commandName && _commandName.name ? _commandName.name : item.commandName,
-                commandDateAffect: item.commandDateAffect
-                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateAffect))
+            const dateAffect = item.commandDateAffect
+              ? `${Extension.ToThaiFullDate2(item.commandDateAffect)}`
+              : "-";
+            return {
+              commandName:
+                _commandName && _commandName.name ? _commandName.name : item.commandName,
+              commandDateAffect: item.commandDateAffect
+                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateAffect))
+                : "",
+              commandDateSign: item.commandDateSign
+                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateSign))
+                : "",
+              posNo:
+                item.posNoAbb && item.posNo
+                  ? Extension.ToThaiNumber(`${item.posNoAbb} ${item.posNo}`)
                   : "",
-                commandDateSign: item.commandDateSign
-                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateSign))
-                  : "",
-                posNo:
-                  item.posNoAbb && item.posNo
-                    ? Extension.ToThaiNumber(`${item.posNoAbb} ${item.posNo}`)
-                    : "",
-                position: item.positionName,
-                posType: item.positionType,
-                posLevel: item.positionLevel
-                  ? Extension.ToThaiNumber(item.positionLevel)
-                  : item.positionCee
-                    ? Extension.ToThaiNumber(item.positionCee)
-                    : null,
-                amount: item.amount
-                  ? Extension.ToThaiNumber(Number(item.amount).toLocaleString())
-                  : "",
-                positionSalaryAmount: item.positionSalaryAmount
-                  ? Extension.ToThaiNumber(Number(item.positionSalaryAmount).toLocaleString())
-                  : "",
-                refDoc: Extension.ToThaiNumber(
-                  `คำสั่ง ${codeSitAbb} ที่ ${commandNo} ลว. ${dateAffect}`,
-                ),
-              };
-            }),
-          )
+              position: item.positionName,
+              posType: item.positionType,
+              posLevel: item.positionLevel
+                ? Extension.ToThaiNumber(item.positionLevel)
+                : item.positionCee
+                  ? Extension.ToThaiNumber(item.positionCee)
+                  : null,
+              amount: item.amount
+                ? Extension.ToThaiNumber(Number(item.amount).toLocaleString())
+                : "",
+              positionSalaryAmount: item.positionSalaryAmount
+                ? Extension.ToThaiNumber(Number(item.positionSalaryAmount).toLocaleString())
+                : "",
+              refDoc: Extension.ToThaiNumber(
+                `คำสั่ง ${codeSitAbb} ที่ ${commandNo} ลว. ${dateAffect}`,
+              ),
+            };
+          }),
+        )
         : [
-            {
-              commandName: "",
-              commandDateAffect: "",
-              commandDateSign: "",
-              posNo: "",
-              position: "",
-              posType: "",
-              posLevel: "",
-              amount: "",
-              positionSalaryAmount: "",
-              refDoc: "",
-            },
-          ];
+          {
+            commandName: "",
+            commandDateAffect: "",
+            commandDateSign: "",
+            posNo: "",
+            position: "",
+            posType: "",
+            posLevel: "",
+            amount: "",
+            positionSalaryAmount: "",
+            refDoc: "",
+          },
+        ];
 
     // ลูกจ้างยังไม่มีรักษาการและช่วยราชการ
     // const actposition_raw = await this.profileActpositionRepo.find({
@@ -1791,36 +1786,36 @@ export class ProfileEmployeeController extends Controller {
     const duty =
       duty_raw.length > 0
         ? duty_raw.map((item) => ({
-            date:
-              item.dateStart && item.dateEnd
-                ? Extension.ToThaiNumber(
-                    `${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`,
-                  )
-                : item.dateStart
-                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
-                  : item.dateEnd
-                    ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
-                    : "",
-            type: "-",
-            detail: Extension.ToThaiNumber(item.detail),
-            agency: "-",
-            refCommandNo: item.refCommandNo
-              ? item.refCommandDate
-                ? Extension.ToThaiNumber(
-                    `${item.refCommandNo} ลว. ${Extension.ToThaiFullDate2(item.refCommandDate)}`,
-                  )
-                : Extension.ToThaiNumber(item.refCommandNo)
-              : "-",
-          }))
+          date:
+            item.dateStart && item.dateEnd
+              ? Extension.ToThaiNumber(
+                `${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`,
+              )
+              : item.dateStart
+                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
+                : item.dateEnd
+                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateEnd))
+                  : "",
+          type: "-",
+          detail: Extension.ToThaiNumber(item.detail),
+          agency: "-",
+          refCommandNo: item.refCommandNo
+            ? item.refCommandDate
+              ? Extension.ToThaiNumber(
+                `${item.refCommandNo} ลว. ${Extension.ToThaiFullDate2(item.refCommandDate)}`,
+              )
+              : Extension.ToThaiNumber(item.refCommandNo)
+            : "-",
+        }))
         : [
-            {
-              date: "",
-              type: "",
-              detail: "",
-              agency: "",
-              refCommandNo: "",
-            },
-          ];
+          {
+            date: "",
+            type: "",
+            detail: "",
+            agency: "",
+            refCommandNo: "",
+          },
+        ];
     const assessments_raw = await this.profileAssessmentsRepository.find({
       where: { profileEmployeeId: id, isDeleted: false },
       order: { createdAt: "ASC" },
@@ -1828,48 +1823,48 @@ export class ProfileEmployeeController extends Controller {
     const assessments =
       assessments_raw.length > 0
         ? assessments_raw.map((item) => ({
-            year: item.year ? Extension.ToThaiNumber((parseInt(item.year) + 543).toString()) : "",
-            period:
-              item.period && item.period == "APR"
-                ? Extension.ToThaiNumber(
-                    `1 เม.ย. ${(parseInt(item.year) + 543 - 1).toString()} - 31 มี.ค. ${(parseInt(item.year) + 543).toString()}`,
-                  )
-                : Extension.ToThaiNumber(
-                    `1 ต.ค. ${(parseInt(item.year) + 543 - 1).toString()} - 30 ก.ย. ${(parseInt(item.year) + 543).toString()}`,
-                  ),
-            point1: item.point1 ? Extension.ToThaiNumber(item.point1.toString()) : "",
-            point1Total: item.point1Total
-              ? Extension.ToThaiNumber(item.point1Total.toString())
-              : "",
-            point2: item.point2 ? Extension.ToThaiNumber(item.point2.toString()) : "",
-            point2Total: item.point2Total
-              ? Extension.ToThaiNumber(item.point2Total.toString())
-              : "",
-            pointSum: item.pointSum
-              ? Extension.ToThaiNumber(`ร้อยละ ${item.pointSum.toString()}`)
-              : "",
-            pointSumTh: item.pointSum ? Extension.textPoint(item.pointSum) : "",
-            level:
-              item.pointSum < 60.0
-                ? "ต้องปรับปรุง"
-                : item.pointSum <= 69.99 && item.pointSum >= 60.0
-                  ? "พอใช้"
-                  : item.pointSum <= 79.99 && item.pointSum >= 70.0
-                    ? "ดี"
-                    : item.pointSum <= 89.99 && item.pointSum >= 80.0
-                      ? "ดีมาก"
-                      : "ดีเด่น",
-          }))
+          year: item.year ? Extension.ToThaiNumber((parseInt(item.year) + 543).toString()) : "",
+          period:
+            item.period && item.period == "APR"
+              ? Extension.ToThaiNumber(
+                `1 เม.ย. ${(parseInt(item.year) + 543 - 1).toString()} - 31 มี.ค. ${(parseInt(item.year) + 543).toString()}`,
+              )
+              : Extension.ToThaiNumber(
+                `1 ต.ค. ${(parseInt(item.year) + 543 - 1).toString()} - 30 ก.ย. ${(parseInt(item.year) + 543).toString()}`,
+              ),
+          point1: item.point1 ? Extension.ToThaiNumber(item.point1.toString()) : "",
+          point1Total: item.point1Total
+            ? Extension.ToThaiNumber(item.point1Total.toString())
+            : "",
+          point2: item.point2 ? Extension.ToThaiNumber(item.point2.toString()) : "",
+          point2Total: item.point2Total
+            ? Extension.ToThaiNumber(item.point2Total.toString())
+            : "",
+          pointSum: item.pointSum
+            ? Extension.ToThaiNumber(`ร้อยละ ${item.pointSum.toString()}`)
+            : "",
+          pointSumTh: item.pointSum ? Extension.textPoint(item.pointSum) : "",
+          level:
+            item.pointSum < 60.0
+              ? "ต้องปรับปรุง"
+              : item.pointSum <= 69.99 && item.pointSum >= 60.0
+                ? "พอใช้"
+                : item.pointSum <= 79.99 && item.pointSum >= 70.0
+                  ? "ดี"
+                  : item.pointSum <= 89.99 && item.pointSum >= 80.0
+                    ? "ดีมาก"
+                    : "ดีเด่น",
+        }))
         : [
-            {
-              year: "",
-              period: "",
-              point1: "",
-              point2: "",
-              pointSum: "",
-              pointSumTh: "",
-            },
-          ];
+          {
+            year: "",
+            period: "",
+            point1: "",
+            point2: "",
+            pointSum: "",
+            pointSumTh: "",
+          },
+        ];
     const profileAbility_raw = await this.profileAbilityRepo.find({
       where: { profileEmployeeId: id },
       order: { createdAt: "ASC" },
@@ -1877,15 +1872,15 @@ export class ProfileEmployeeController extends Controller {
     const profileAbility =
       profileAbility_raw.length > 0
         ? profileAbility_raw.map((item) => ({
-            field: item.field ? item.field : "",
-            detail: item.detail ? item.detail : "",
-          }))
+          field: item.field ? item.field : "",
+          detail: item.detail ? item.detail : "",
+        }))
         : [
-            {
-              field: "",
-              detail: "",
-            },
-          ];
+          {
+            field: "",
+            detail: "",
+          },
+        ];
 
     const otherIncome_raw = await this.salaryRepo.find({
       where: {
@@ -1898,53 +1893,53 @@ export class ProfileEmployeeController extends Controller {
     const otherIncome =
       otherIncome_raw.length > 0
         ? await Promise.all(
-            otherIncome_raw.map(async (item) => {
-              const codeSitAbb = item.posNumCodeSitAbb ?? "-";
-              const commandNo =
-                item.commandNo && item.commandYear
-                  ? item.commandNo +
-                    "/" +
-                    (item.commandYear > 2500 ? item.commandYear : item.commandYear + 543)
-                  : "-";
-              const dateAffect = item.commandDateAffect
-                ? `${Extension.ToThaiFullDate2(item.commandDateAffect)}`
+          otherIncome_raw.map(async (item) => {
+            const codeSitAbb = item.posNumCodeSitAbb ?? "-";
+            const commandNo =
+              item.commandNo && item.commandYear
+                ? item.commandNo +
+                "/" +
+                (item.commandYear > 2500 ? item.commandYear : item.commandYear + 543)
                 : "-";
-              return {
-                commandName: item.commandName ?? "",
-                commandDateAffect: item.commandDateAffect
-                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateAffect))
-                  : "",
-                commandDateSign: item.commandDateSign
-                  ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateSign))
-                  : "",
-                commandNo: item.commandNo ? Extension.ToThaiNumber(item.commandNo) : "",
-                position: item.positionName,
-                posLevel: item.positionLevel
-                  ? Extension.ToThaiNumber(item.positionLevel)
-                  : item.positionCee
-                    ? Extension.ToThaiNumber(item.positionCee)
-                    : null,
-                amount: item.amount
-                  ? Extension.ToThaiNumber(Number(item.amount).toLocaleString())
-                  : "",
-                refDoc: Extension.ToThaiNumber(
-                  `คำสั่ง ${codeSitAbb} ที่ ${commandNo} ลว. ${dateAffect}`,
-                ),
-              };
-            }),
-          )
+            const dateAffect = item.commandDateAffect
+              ? `${Extension.ToThaiFullDate2(item.commandDateAffect)}`
+              : "-";
+            return {
+              commandName: item.commandName ?? "",
+              commandDateAffect: item.commandDateAffect
+                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateAffect))
+                : "",
+              commandDateSign: item.commandDateSign
+                ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.commandDateSign))
+                : "",
+              commandNo: item.commandNo ? Extension.ToThaiNumber(item.commandNo) : "",
+              position: item.positionName,
+              posLevel: item.positionLevel
+                ? Extension.ToThaiNumber(item.positionLevel)
+                : item.positionCee
+                  ? Extension.ToThaiNumber(item.positionCee)
+                  : null,
+              amount: item.amount
+                ? Extension.ToThaiNumber(Number(item.amount).toLocaleString())
+                : "",
+              refDoc: Extension.ToThaiNumber(
+                `คำสั่ง ${codeSitAbb} ที่ ${commandNo} ลว. ${dateAffect}`,
+              ),
+            };
+          }),
+        )
         : [
-            {
-              commandName: "",
-              commandDateAffect: "",
-              commandDateSign: "",
-              commandNo: "",
-              position: "",
-              posLevel: "",
-              amount: "",
-              refDoc: "",
-            },
-          ];
+          {
+            commandName: "",
+            commandDateAffect: "",
+            commandDateSign: "",
+            commandNo: "",
+            position: "",
+            posLevel: "",
+            amount: "",
+            refDoc: "",
+          },
+        ];
 
     // ประวัติพ้นจากราชการ
     let retires = [];
@@ -2043,8 +2038,8 @@ export class ProfileEmployeeController extends Controller {
       profiles?.position != null
         ? profiles.posType != null && profiles?.posLevel != null
           ? Extension.ToThaiNumber(
-              `${profiles.position} ${profiles.posType.posTypeShortName} ${profiles.posLevel.posLevelName}`,
-            )
+            `${profiles.position} ${profiles.posType.posTypeShortName} ${profiles.posLevel.posLevelName}`,
+          )
           : profiles.position
         : ""
     ).trim();
@@ -2061,45 +2056,45 @@ export class ProfileEmployeeController extends Controller {
 
     const sum = profiles
       ? Extension.ToThaiNumber(
-          (
-            Number(profiles.amount) +
-            Number(profiles.positionSalaryAmount) +
-            Number(profiles.mouthSalaryAmount) +
-            Number(profiles.amountSpecial)
-          ).toLocaleString(),
-        )
+        (
+          Number(profiles.amount) +
+          Number(profiles.positionSalaryAmount) +
+          Number(profiles.mouthSalaryAmount) +
+          Number(profiles.amountSpecial)
+        ).toLocaleString(),
+      )
       : "";
     const fullCurrentAddress =
       profiles && profiles.currentAddress
         ? Extension.ToThaiNumber(
-            profiles.currentAddress +
-              (profiles.currentSubDistrict && profiles.currentSubDistrict.name
-                ? " ตำบล/แขวง " + profiles.currentSubDistrict.name
-                : "") +
-              (profiles.currentDistrict && profiles.currentDistrict.name
-                ? " อำเภอ/เขต " + profiles.currentDistrict.name
-                : "") +
-              (profiles.currentProvince && profiles.currentProvince.name
-                ? " จังหวัด " + profiles.currentProvince.name
-                : "") +
-              (profiles.currentZipCode ? " " + profiles.currentZipCode : ""),
-          )
+          profiles.currentAddress +
+          (profiles.currentSubDistrict && profiles.currentSubDistrict.name
+            ? " ตำบล/แขวง " + profiles.currentSubDistrict.name
+            : "") +
+          (profiles.currentDistrict && profiles.currentDistrict.name
+            ? " อำเภอ/เขต " + profiles.currentDistrict.name
+            : "") +
+          (profiles.currentProvince && profiles.currentProvince.name
+            ? " จังหวัด " + profiles.currentProvince.name
+            : "") +
+          (profiles.currentZipCode ? " " + profiles.currentZipCode : ""),
+        )
         : "";
     const fullRegistrationAddress =
       profiles && profiles.registrationAddress
         ? Extension.ToThaiNumber(
-            profiles.registrationAddress +
-              (profiles.registrationSubDistrict && profiles.registrationSubDistrict.name
-                ? " ตำบล/แขวง " + profiles.registrationSubDistrict.name
-                : "") +
-              (profiles.registrationDistrict && profiles.registrationDistrict.name
-                ? " อำเภอ/เขต " + profiles.registrationDistrict.name
-                : "") +
-              (profiles.registrationProvince && profiles.registrationProvince.name
-                ? " จังหวัด " + profiles.registrationProvince.name
-                : "") +
-              (profiles.currentZipCode ? " " + profiles.currentZipCode : ""),
-          )
+          profiles.registrationAddress +
+          (profiles.registrationSubDistrict && profiles.registrationSubDistrict.name
+            ? " ตำบล/แขวง " + profiles.registrationSubDistrict.name
+            : "") +
+          (profiles.registrationDistrict && profiles.registrationDistrict.name
+            ? " อำเภอ/เขต " + profiles.registrationDistrict.name
+            : "") +
+          (profiles.registrationProvince && profiles.registrationProvince.name
+            ? " จังหวัด " + profiles.registrationProvince.name
+            : "") +
+          (profiles.currentZipCode ? " " + profiles.currentZipCode : ""),
+        )
         : "";
     const data = {
       currentDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(currentDate)),
@@ -2147,24 +2142,24 @@ export class ProfileEmployeeController extends Controller {
         profiles.citizenId != null ? Extension.ToThaiNumber(profiles.citizenId.toString()) : "",
       fatherFullName:
         profileFamilyFather?.fatherPrefix ||
-        profileFamilyFather?.fatherFirstName ||
-        profileFamilyFather?.fatherLastName
+          profileFamilyFather?.fatherFirstName ||
+          profileFamilyFather?.fatherLastName
           ? `${profileFamilyFather?.fatherPrefix ?? ""}${profileFamilyFather?.fatherFirstName ?? ""} ${profileFamilyFather?.fatherLastName ?? ""}`.trim()
           : null,
       fatherLive:
         profileFamilyFather && profileFamilyFather?.fatherLive == true ? "ถึงแก่กรรม" : "มีชีวิต",
       motherFullName:
         profileFamilyMother?.motherPrefix ||
-        profileFamilyMother?.motherFirstName ||
-        profileFamilyMother?.motherLastName
+          profileFamilyMother?.motherFirstName ||
+          profileFamilyMother?.motherLastName
           ? `${profileFamilyMother?.motherPrefix ?? ""}${profileFamilyMother?.motherFirstName ?? ""} ${profileFamilyMother?.motherLastName ?? ""}`.trim()
           : null,
       motherLive:
         profileFamilyMother && profileFamilyMother?.motherLive == true ? "ถึงแก่กรรม" : "มีชีวิต",
       coupleFullName:
         profileFamilyCouple?.couplePrefix ||
-        profileFamilyCouple?.coupleFirstName ||
-        profileFamilyCouple?.coupleLastNameOld
+          profileFamilyCouple?.coupleFirstName ||
+          profileFamilyCouple?.coupleLastNameOld
           ? `${profileFamilyCouple?.couplePrefix ?? ""}${profileFamilyCouple?.coupleFirstName ?? ""} ${profileFamilyCouple?.coupleLastName ?? ""}`.trim()
           : null,
       coupleLastNameOld: profileFamilyCouple?.coupleLastNameOld ?? null,
@@ -2536,8 +2531,8 @@ export class ProfileEmployeeController extends Controller {
           _data.profileEmployeeEmployment.length == 0
             ? null
             : _data.profileEmployeeEmployment.reduce((latest, current) => {
-                return latest.date > current.date ? latest : current;
-              }).date;
+              return latest.date > current.date ? latest : current;
+            }).date;
         return {
           id: _data.id,
           prefix: _data.prefix,
@@ -2700,32 +2695,32 @@ export class ProfileEmployeeController extends Controller {
         profile.current_holders.length == 0
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-              profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
-                null
+            profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
+            null
             ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
             : profile.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                  ?.orgChild3 != null
+              profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                ?.orgChild3 != null
               ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
               : profile.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                  profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                    ?.orgChild2 != null
+                profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                  ?.orgChild2 != null
                 ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                 : profile.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                    profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                      ?.orgChild1 != null
+                  profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                    ?.orgChild1 != null
                   ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                   : profile.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
-                        null &&
-                      profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                        ?.orgRoot != null
+                    null &&
+                    profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                      ?.orgRoot != null
                     ? `${profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                     : null;
 
       const root =
         profile.current_holders.length == 0 ||
-        (profile.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-          profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
+          (profile.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+            profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;
 
@@ -2950,57 +2945,57 @@ export class ProfileEmployeeController extends Controller {
           _data.current_holders.length == 0
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == revisionId) != null &&
-                _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4 != null
+              _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4 != null
               ? `${_data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4.orgChild4ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == revisionId)?.posMasterNo}`
               : _data.current_holders.find((x) => x.orgRevisionId == revisionId) != null &&
-                  _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3 !=
-                    null
+                _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3 !=
+                null
                 ? `${_data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3.orgChild3ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == revisionId)?.posMasterNo}`
                 : _data.current_holders.find((x) => x.orgRevisionId == revisionId) != null &&
-                    _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2 !=
-                      null
+                  _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2 !=
+                  null
                   ? `${_data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2.orgChild2ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == revisionId)?.posMasterNo}`
                   : _data.current_holders.find((x) => x.orgRevisionId == revisionId) != null &&
-                      _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1 !=
-                        null
+                    _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1 !=
+                    null
                     ? `${_data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1.orgChild1ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == revisionId)?.posMasterNo}`
                     : _data.current_holders.find((x) => x.orgRevisionId == revisionId) != null &&
-                        _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot !=
-                          null
+                      _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot !=
+                      null
                       ? `${_data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot.orgRootShortName} ${_data.current_holders.find((x) => x.orgRevisionId == revisionId)?.posMasterNo}`
                       : null;
         const root =
           _data.current_holders.length == 0 ||
-          (_data.current_holders.find((x) => x.orgRevisionId == revisionId) != null &&
-            _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot == null)
+            (_data.current_holders.find((x) => x.orgRevisionId == revisionId) != null &&
+              _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot == null)
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot;
 
         const child1 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == revisionId) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == revisionId) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1;
 
         const child2 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == revisionId) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == revisionId) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2;
 
         const child3 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == revisionId) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == revisionId) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3;
 
         const child4 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == revisionId) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == revisionId) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4;
 
@@ -3111,7 +3106,7 @@ export class ProfileEmployeeController extends Controller {
     @Query() sortBy: string = "profileEmployee.dateLeave",
     @Query() sort: "ASC" | "DESC" = "DESC",
   ) {
-    let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_EMP");
+    let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_RETIRE_EMP");
 
     const { data, total } = await this.profileLeaveService.getLeaveEmployees(request, {
       page,
@@ -3275,7 +3270,7 @@ export class ProfileEmployeeController extends Controller {
           ? _data.child1[0] != null
             ? `current_holders.orgChild1Id IN (:...child1)`
             : // : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
-              `current_holders.orgChild1Id is null`
+            `current_holders.orgChild1Id is null`
           : "1=1",
         {
           child1: _data.child1,
@@ -3387,40 +3382,40 @@ export class ProfileEmployeeController extends Controller {
           _data.profileEmployeeEmployment.length == 0
             ? null
             : _data.profileEmployeeEmployment.reduce((latest, current) => {
-                return latest.date > current.date ? latest : current;
-              }).date;
+              return latest.date > current.date ? latest : current;
+            }).date;
         const root =
           _data.current_holders.length == 0 ||
-          (_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-            _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
+            (_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+              _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;
 
         const child1 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1;
 
         const child2 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2;
 
         const child3 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3;
 
         const child4 =
           _data.current_holders == null ||
-          _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+            _data.current_holders.length == 0 ||
+            _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
             ? null
             : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4;
 
@@ -3688,8 +3683,8 @@ export class ProfileEmployeeController extends Controller {
                 .map((x) => x.current_holderId).length == 0
                 ? ["zxc"]
                 : orgRevision.employeePosMasters
-                    .filter((x) => x.current_holderId != null)
-                    .map((x) => x.current_holderId),
+                  .filter((x) => x.current_holderId != null)
+                  .map((x) => x.current_holderId),
           });
         }),
       )
@@ -3927,37 +3922,37 @@ export class ProfileEmployeeController extends Controller {
 
     const posMaster =
       profile.current_holders == null ||
-      profile.current_holders.length == 0 ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) == null
+        profile.current_holders.length == 0 ||
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id);
 
     const root =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == null
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot;
     const child1 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1;
     const child2 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2;
     const child3 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3;
     const child4 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4;
@@ -4158,7 +4153,7 @@ export class ProfileEmployeeController extends Controller {
           ? _data.child1[0] != null
             ? `current_holders.orgChild1Id IN (:...child1)`
             : // : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
-              `current_holders.orgChild1Id is null`
+            `current_holders.orgChild1Id is null`
           : "1=1",
         { child1: _data.child1 },
       )
@@ -4202,32 +4197,32 @@ export class ProfileEmployeeController extends Controller {
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3 !=
-                    null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3 !=
+                null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                      ?.orgChild2 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                        ?.orgChild1 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                       : null;
 
         const root =
           item.current_holders.length == 0 ||
-          (item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-            item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
+            (item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+              item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;
 
@@ -4717,7 +4712,7 @@ export class ProfileEmployeeController extends Controller {
           ? _data.child1[0] != null
             ? `current_holders.orgChild1Id IN (:...child1)`
             : // : `current_holders.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
-              `current_holders.orgChild1Id is null`
+            `current_holders.orgChild1Id is null`
           : "1=1",
         {
           child1: _data.child1,
@@ -4788,54 +4783,54 @@ export class ProfileEmployeeController extends Controller {
           isProbation: item.isProbation,
           orgRootName:
             item.current_holders == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot ==
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot ==
               null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot
-              ?.orgRootName == null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot
+                ?.orgRootName == null
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot
-                  ?.orgRootName,
+                ?.orgRootName,
           orgChild1Name:
             item.current_holders == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild1 ==
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild1 ==
               null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild1
-              ?.orgChild1Name == null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild1
+                ?.orgChild1Name == null
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                  ?.orgChild1?.orgChild1Name,
+                ?.orgChild1?.orgChild1Name,
           orgChild2Name:
             item.current_holders == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild2 ==
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild2 ==
               null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild2
-              ?.orgChild2Name == null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild2
+                ?.orgChild2Name == null
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                  ?.orgChild2?.orgChild2Name,
+                ?.orgChild2?.orgChild2Name,
           orgChild3Name:
             item.current_holders == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild3 ==
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild3 ==
               null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild3
-              ?.orgChild3Name == null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild3
+                ?.orgChild3Name == null
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                  ?.orgChild3?.orgChild3Name,
+                ?.orgChild3?.orgChild3Name,
           orgChild4Name:
             item.current_holders == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild4 ==
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild4 ==
               null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild4
-              ?.orgChild4Name == null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild4
+                ?.orgChild4Name == null
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                  ?.orgChild4?.orgChild4Name,
+                ?.orgChild4?.orgChild4Name,
         };
       }),
     );
@@ -4912,49 +4907,49 @@ export class ProfileEmployeeController extends Controller {
       findProfile.map(async (item: ProfileEmployee) => {
         const posMaster =
           item.current_holders == null ||
-          item.current_holders.length == 0 ||
-          item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
+            item.current_holders.length == 0 ||
+            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) == null
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id);
         const position =
           posMaster == null ||
-          item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions ==
+            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions ==
             null ||
-          item.current_holders?.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions
-            .length == 0 ||
-          item.current_holders
-            .find((x) => x.orgRevisionId == orgRevisionActive.id)
-            ?.positions?.find((position) => position.positionIsSelected == true) == null
+            item.current_holders?.find((x) => x.orgRevisionId == orgRevisionActive.id)?.positions
+              .length == 0 ||
+            item.current_holders
+              .find((x) => x.orgRevisionId == orgRevisionActive.id)
+              ?.positions?.find((position) => position.positionIsSelected == true) == null
             ? null
             : item.current_holders
-                .find((x) => x.orgRevisionId == orgRevisionActive.id)
-                ?.positions?.find((position) => position.positionIsSelected == true);
+              .find((x) => x.orgRevisionId == orgRevisionActive.id)
+              ?.positions?.find((position) => position.positionIsSelected == true);
 
         const shortName =
           item.current_holders.length == 0
             ? null
             : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
-                  ?.orgChild4 != null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
+                ?.orgChild4 != null
               ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
-                    ?.orgChild3 != null
+                item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
+                  ?.orgChild3 != null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) !=
-                      null &&
-                    item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
-                      ?.orgChild2 != null
+                  null &&
+                  item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
+                    ?.orgChild2 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) !=
-                        null &&
-                      item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
-                        ?.orgChild1 != null
+                    null &&
+                    item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
+                      ?.orgChild1 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
-                          ?.orgRoot != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)
+                        ?.orgRoot != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive.id)?.posMasterNo}`
                       : null;
 
@@ -4972,54 +4967,54 @@ export class ProfileEmployeeController extends Controller {
           isProbation: item.isProbation,
           orgRootName:
             item.current_holders == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot ==
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot ==
               null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot
-              ?.orgRootName == null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot
+                ?.orgRootName == null
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgRoot
-                  ?.orgRootName,
+                ?.orgRootName,
           orgChild1Name:
             item.current_holders == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild1 ==
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild1 ==
               null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild1
-              ?.orgChild1Name == null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild1
+                ?.orgChild1Name == null
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                  ?.orgChild1?.orgChild1Name,
+                ?.orgChild1?.orgChild1Name,
           orgChild2Name:
             item.current_holders == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild2 ==
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild2 ==
               null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild2
-              ?.orgChild2Name == null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild2
+                ?.orgChild2Name == null
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                  ?.orgChild2?.orgChild2Name,
+                ?.orgChild2?.orgChild2Name,
           orgChild3Name:
             item.current_holders == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild3 ==
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild3 ==
               null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild3
-              ?.orgChild3Name == null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild3
+                ?.orgChild3Name == null
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                  ?.orgChild3?.orgChild3Name,
+                ?.orgChild3?.orgChild3Name,
           orgChild4Name:
             item.current_holders == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild4 ==
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id) == null ||
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild4 ==
               null ||
-            item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild4
-              ?.orgChild4Name == null
+              item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)?.orgChild4
+                ?.orgChild4Name == null
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == orgRevisionActive?.id)
-                  ?.orgChild4?.orgChild4Name,
+                ?.orgChild4?.orgChild4Name,
         };
       }),
     );
@@ -5312,7 +5307,7 @@ export class ProfileEmployeeController extends Controller {
         isLeave: false,
         isRetired:
           item.current_holder.birthDate == null ||
-          calculateRetireDate(item.current_holder.birthDate).getFullYear() != body.year
+            calculateRetireDate(item.current_holder.birthDate).getFullYear() != body.year
             ? false
             : true,
         isSpecial: false,
@@ -5366,98 +5361,98 @@ export class ProfileEmployeeController extends Controller {
       posTypeId: profile.posType == null ? null : profile.posType.id,
       rootId:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRootId,
       rootDnaId:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.ancestorDNA,
       root:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgRoot.orgRootName,
       child1Id:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1Id,
       child1DnaId:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.ancestorDNA,
       child1:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild1
-              .orgChild1Name,
+            .orgChild1Name,
       child2Id:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2Id,
       child2DnaId:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.ancestorDNA,
       child2:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild2
-              .orgChild2Name,
+            .orgChild2Name,
       child3Id:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3Id,
       child3DnaId:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.ancestorDNA,
       child3:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild3
-              .orgChild3Name,
+            .orgChild3Name,
       child4Id:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4Id,
       child4DnaId:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.ancestorDNA,
       child4:
         profile.current_holders == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-        profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4 == null
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+          profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4 == null
           ? null
           : profile.current_holders.find((x) => x.orgRevisionId == revisionId)?.orgChild4
-              .orgChild4Name,
+            .orgChild4Name,
     };
     return new HttpSuccess(_profile);
   }
@@ -5509,8 +5504,8 @@ export class ProfileEmployeeController extends Controller {
     const formattedData = profiles.map((item) => {
       const posMaster =
         item.current_holders == null ||
-        item.current_holders.length == 0 ||
-        item.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
+          item.current_holders.length == 0 ||
+          item.current_holders.find((x) => x.orgRevisionId == findRevision.id) == null
           ? null
           : item.current_holders.find((x) => x.orgRevisionId == findRevision.id);
 
@@ -5518,49 +5513,49 @@ export class ProfileEmployeeController extends Controller {
         item.current_holders.length == 0
           ? null
           : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-              item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
-                null
+            item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
+            null
             ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
             : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3 !=
-                  null
+              item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3 !=
+              null
               ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
               : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2 !=
-                    null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2 !=
+                null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                      ?.orgChild1 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                    ?.orgChild1 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                        ?.orgRoot != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                      ?.orgRoot != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                     : null;
       const root =
         item.current_holders == null ||
-        item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null
+          item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null
           ? null
           : item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;
       const child1 =
         item.current_holders == null ||
-        item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1 == null
+          item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1 == null
           ? null
           : item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1;
       const child2 =
         item.current_holders == null ||
-        item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2 == null
+          item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2 == null
           ? null
           : item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2;
       const child3 =
         item.current_holders == null ||
-        item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3 == null
+          item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3 == null
           ? null
           : item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3;
       const child4 =
         item.current_holders == null ||
-        item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 == null
+          item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 == null
           ? null
           : item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4;
 
@@ -5683,24 +5678,24 @@ export class ProfileEmployeeController extends Controller {
       !profile.current_holders || profile.current_holders.length == 0
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) != null &&
-            profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild4 !=
-              null
+          profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild4 !=
+          null
           ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild4.orgChild4ShortName}`
           : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) != null &&
-              profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild3 !=
-                null
+            profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild3 !=
+            null
             ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild3.orgChild3ShortName}`
             : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) != null &&
-                profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
-                  ?.orgChild2 != null
+              profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
+                ?.orgChild2 != null
               ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild2.orgChild2ShortName}`
               : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) != null &&
-                  profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
-                    ?.orgChild1 != null
+                profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
+                  ?.orgChild1 != null
                 ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgChild1.orgChild1ShortName}`
                 : profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id) != null &&
-                    profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
-                      ?.orgRoot != null
+                  profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)
+                    ?.orgRoot != null
                   ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevision?.id)?.orgRoot.orgRootShortName}`
                   : null;
     const dest_item = await this.salaryRepo.findOne({
@@ -6161,7 +6156,7 @@ export class ProfileEmployeeController extends Controller {
               positionId: profile.positionIdTemp,
               profileId: profile.id,
             })
-            .then(async () => {});
+            .then(async () => { });
         }
       }),
     );
@@ -6255,33 +6250,33 @@ export class ProfileEmployeeController extends Controller {
             item.current_holders.length == 0
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                  item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
-                    null
+                item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
+                null
                 ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                 : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                    item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                      ?.orgChild3 != null
+                  item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                    ?.orgChild3 != null
                   ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                   : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                      item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                        ?.orgChild2 != null
+                    item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                      ?.orgChild2 != null
                     ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                     : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
-                          null &&
-                        item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                          ?.orgChild1 != null
+                      null &&
+                      item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                        ?.orgChild1 != null
                       ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                       : item.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
-                            null &&
-                          item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                            ?.orgRoot != null
+                        null &&
+                        item.current_holders.find((x) => x.orgRevisionId == findRevision.id)
+                          ?.orgRoot != null
                         ? `${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
                         : null;
 
           root =
             item.current_holders.length == 0 ||
-            (item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-              item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
+              (item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+                item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
               ? null
               : item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;
           root = root == null ? null : root.orgRootName;
@@ -6432,36 +6427,36 @@ export class ProfileEmployeeController extends Controller {
     });
     const posMaster =
       profile.current_holders == null ||
-      profile.current_holders.length == 0 ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) == null
+        profile.current_holders.length == 0 ||
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id);
     const root =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == null
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot == null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot;
     const child1 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1;
     const child2 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2;
     const child3 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3;
     const child4 =
       profile.current_holders == null ||
-      profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 ==
+        profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4 ==
         null
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4;
@@ -6469,27 +6464,27 @@ export class ProfileEmployeeController extends Controller {
       profile.current_holders.length == 0
         ? null
         : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) != null &&
-            profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-              ?.orgChild4 != null
+          profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
+            ?.orgChild4 != null
           ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4.orgChild4ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.posMasterNo}`
           : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) != null &&
-              profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-                ?.orgChild3 != null
+            profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
+              ?.orgChild3 != null
             ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild3.orgChild3ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.posMasterNo}`
             : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) !=
-                  null &&
-                profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-                  ?.orgChild2 != null
+              null &&
+              profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
+                ?.orgChild2 != null
               ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild2.orgChild2ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.posMasterNo}`
               : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) !=
-                    null &&
-                  profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-                    ?.orgChild1 != null
+                null &&
+                profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
+                  ?.orgChild1 != null
                 ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild1.orgChild1ShortName} ${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.posMasterNo}`
                 : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id) !=
-                      null &&
-                    profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-                      ?.orgRoot != null
+                  null &&
+                  profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
+                    ?.orgRoot != null
                   ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot.orgRootShortName} ${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.posMasterNo}`
                   : null;
     const _profile: any = {
diff --git a/src/services/ProfileLeaveService.ts b/src/services/ProfileLeaveService.ts
index 327a1fe2..16284bb7 100644
--- a/src/services/ProfileLeaveService.ts
+++ b/src/services/ProfileLeaveService.ts
@@ -1,12 +1,13 @@
 import { AppDataSource } from "../database/data-source";
 import { Profile } from "./../entities/Profile";
 import { ProfileEmployee } from "../entities/ProfileEmployee";
+import { ProfileSalary } from "./../entities/ProfileSalary";
 import { OrgRoot } from "../entities/OrgRoot";
 import { OrgChild1 } from "../entities/OrgChild1";
 import { OrgChild2 } from "../entities/OrgChild2";
 import { OrgChild3 } from "../entities/OrgChild3";
 import { OrgChild4 } from "../entities/OrgChild4";
-import { Brackets, Repository } from "typeorm";
+import { Brackets, In, Repository } from "typeorm";
 import Extension from "../interfaces/extension";
 import { RequestWithUser } from "../middlewares/user";
 
@@ -62,6 +63,7 @@ interface OrgParentName {
 export class ProfileLeaveService {
   private profileEmployeeRepo: Repository<ProfileEmployee>;
   private profileRepo: Repository<Profile>;
+  private profileSalaryRepo: Repository<ProfileSalary>;
   private orgRootRepository: Repository<OrgRoot>;
   private child1Repository: Repository<OrgChild1>;
   private child2Repository: Repository<OrgChild2>;
@@ -72,6 +74,7 @@ export class ProfileLeaveService {
   constructor() {
     this.profileEmployeeRepo = AppDataSource.getRepository(ProfileEmployee);
     this.profileRepo = AppDataSource.getRepository(Profile);
+    this.profileSalaryRepo = AppDataSource.getRepository(ProfileSalary);
     this.orgRootRepository = AppDataSource.getRepository(OrgRoot);
     this.child1Repository = AppDataSource.getRepository(OrgChild1);
     this.child2Repository = AppDataSource.getRepository(OrgChild2);
@@ -207,19 +210,16 @@ export class ProfileLeaveService {
     let params: NodeParams = {};
 
     const orgLists = await this.findOrgNodeParentAll(node, nodeId);
-    console.log("Org Hierarchy for Node Condition:", orgLists);
-    await Promise.all(
-      this.nodeConfigs.map(async (config, index) => {
-        if (index <= node) {
-          const orgName = orgLists[config.nameField as keyof OrgParentName] || null;
-          if (orgName) {
-            nodeCondition += index > 0 ? ` AND ${config.condition}` : config.condition;
-            nodeCondition += isAll === false && config.isAllTrue ? ` AND ${config.isAllTrue}` : "";
-            params[config.paramKey] = orgName;
-          }
-        }
-      }),
-    );
+
+    for (let index = 0; index <= node; index++) {
+      const config = this.nodeConfigs[index];
+      const orgName = orgLists[config.nameField as keyof OrgParentName] || null;
+      if (orgName) {
+        nodeCondition += index > 0 ? ` AND ${config.condition}` : config.condition;
+        nodeCondition += isAll === false && config.isAllTrue ? ` AND ${config.isAllTrue}` : "";
+        params[config.paramKey] = orgName;
+      }
+    }
 
     return {
       condition: nodeCondition,
@@ -234,53 +234,31 @@ export class ProfileLeaveService {
     child3: string | null;
     child4: string | null;
   }): Promise<OrgParentName> {
-    const orgNames: OrgParentName = {
-      orgRootName: null,
-      orgChild1Name: null,
-      orgChild2Name: null,
-      orgChild3Name: null,
-      orgChild4Name: null,
+    const [rootName, child1, child2, child3, child4] = await Promise.all([
+      orgIds.root
+        ? this.orgRootRepository.findOne({ where: { id: orgIds.root }, select: ["orgRootName"] })
+        : Promise.resolve(null),
+      orgIds.child1
+        ? this.child1Repository.findOne({ where: { id: orgIds.child1 }, select: ["orgChild1Name"] })
+        : Promise.resolve(null),
+      orgIds.child2
+        ? this.child2Repository.findOne({ where: { id: orgIds.child2 }, select: ["orgChild2Name"] })
+        : Promise.resolve(null),
+      orgIds.child3
+        ? this.child3Repository.findOne({ where: { id: orgIds.child3 }, select: ["orgChild3Name"] })
+        : Promise.resolve(null),
+      orgIds.child4
+        ? this.child4Repository.findOne({ where: { id: orgIds.child4 }, select: ["orgChild4Name"] })
+        : Promise.resolve(null),
+    ]);
+
+    return {
+      orgRootName: rootName?.orgRootName ?? null,
+      orgChild1Name: child1?.orgChild1Name ?? null,
+      orgChild2Name: child2?.orgChild2Name ?? null,
+      orgChild3Name: child3?.orgChild3Name ?? null,
+      orgChild4Name: child4?.orgChild4Name ?? null,
     };
-    if (orgIds.root) {
-      const rootName = await this.orgRootRepository.findOne({
-        where: { id: orgIds.root },
-        select: ["orgRootName"],
-      });
-      orgNames.orgRootName = rootName ? rootName.orgRootName : null;
-    }
-    if (orgIds.child1) {
-      const child1 = await this.child1Repository.findOne({
-        where: { id: orgIds.child1 },
-        select: ["orgChild1Name"],
-      });
-      orgNames.orgChild1Name = child1 ? child1.orgChild1Name : null;
-    }
-
-    if (orgIds.child2) {
-      const child2 = await this.child2Repository.findOne({
-        where: { id: orgIds.child2 },
-        select: ["orgChild2Name"],
-      });
-      orgNames.orgChild2Name = child2 ? child2.orgChild2Name : null;
-    }
-
-    if (orgIds.child3) {
-      const child3 = await this.child3Repository.findOne({
-        where: { id: orgIds.child3 },
-        select: ["orgChild3Name"],
-      });
-      orgNames.orgChild3Name = child3 ? child3.orgChild3Name : null;
-    }
-
-    if (orgIds.child4) {
-      const child4 = await this.child4Repository.findOne({
-        where: { id: orgIds.child4 },
-        select: ["orgChild4Name"],
-      });
-      orgNames.orgChild4Name = child4 ? child4.orgChild4Name : null;
-    }
-
-    return orgNames;
   }
 
   /** สร้างเงื่อนไขการค้นหาตาม node และ nodeId และเช็คกับ permission */
@@ -317,16 +295,15 @@ export class ProfileLeaveService {
       return { condition: "1=0", params: {} }; // no access
     }
 
-    await Promise.all(
-      this.nodeConfigs.map(async (config, index) => {
-        const orgName = orgLists[config.nameField as keyof OrgParentName] || null;
-        if (orgName) {
-          nodeCondition += index > 0 ? ` AND ${config.condition}` : config.condition;
-          nodeCondition += isAll === false && config.isAllTrue ? ` AND ${config.isAllTrue}` : "";
-          params[config.paramKey] = orgName;
-        }
-      }),
-    );
+    for (let index = 0; index < this.nodeConfigs.length; index++) {
+      const config = this.nodeConfigs[index];
+      const orgName = orgLists[config.nameField as keyof OrgParentName] || null;
+      if (orgName) {
+        nodeCondition += index > 0 ? ` AND ${config.condition}` : config.condition;
+        nodeCondition += isAll === false && config.isAllTrue ? ` AND ${config.isAllTrue}` : "";
+        params[config.paramKey] = orgName;
+      }
+    }
 
     return {
       condition: nodeCondition,
@@ -478,97 +455,146 @@ export class ProfileLeaveService {
       _data,
     } = filter;
 
+    const t0 = Date.now();
     const searchQuery = this.buildSearchQuery(searchField, "profileEmployee");
 
-    // สร้าง main query - เปลี่ยนจาก leftJoinAndSelect เป็น leftJoin สำหรับ profileSalary
-    const queryBuilder = this.profileEmployeeRepo
-      .createQueryBuilder("profileEmployee")
-      .leftJoinAndSelect("profileEmployee.posLevel", "posLevel")
-      .leftJoinAndSelect("profileEmployee.posType", "posType")
-      .leftJoinAndSelect("profileEmployee.profileEmployeeEmployment", "profileEmployeeEmployment")
-      .leftJoin(
-        "profileEmployee.profileSalary",
-        "profileSalary",
-        "profileSalary.order = (SELECT MAX(ps.order) FROM profileSalary ps WHERE ps.profileEmployeeId = profileEmployee.id and ps.positionName != 'เกษียณอายุราชการ')",
-      )
-      .addSelect([
-        "profileSalary.id",
-        "profileSalary.order",
-        "profileSalary.posNo",
-        "profileSalary.posNoAbb",
-        "profileSalary.orgRoot",
-        "profileSalary.orgChild1",
-        "profileSalary.orgChild2",
-        "profileSalary.orgChild3",
-        "profileSalary.orgChild4",
-      ])
-      .where(
-        new Brackets((qb) => {
-          qb.where("profileEmployee.isLeave = :isLeave", { isLeave: true }).orWhere(
+    // สร้าง base WHERE conditions แชร์ระหว่าง count/id/data query
+    const baseWhere = (qb: any) => {
+      qb.where(
+        new Brackets((qb2) => {
+          qb2.where("profileEmployee.isLeave = :isLeave", { isLeave: true }).orWhere(
             "profileEmployee.isRetirement = :isRetirement",
             { isRetirement: true },
           );
         }),
       )
-      .andWhere("profileEmployee.employeeClass LIKE :type", { type: "PERM" })
-      .andWhere(
-        new Brackets((qb) => {
-          qb.orWhere(searchKeyword && searchKeyword != "" ? searchQuery : "1=1", {
-            keyword: `%${searchKeyword}%`,
-          });
-        }),
-      );
+        .andWhere("profileEmployee.employeeClass LIKE :type", { type: "PERM" })
+        .andWhere(
+          new Brackets((qb2) => {
+            qb2.orWhere(searchKeyword && searchKeyword != "" ? searchQuery : "1=1", {
+              keyword: `%${searchKeyword}%`,
+            });
+          }),
+        );
 
-    // เพิ่มเงื่อนไขการค้นหา
-    if (posType) {
-      queryBuilder.andWhere("posType.posTypeName LIKE :keyword1", { keyword1: `${posType}` });
-    }
-
-    if (posLevel) {
-      queryBuilder.andWhere(
-        "CONCAT(posType.posTypeShortName, ' ', posLevel.posLevelName) LIKE :keyword2",
-        { keyword2: `${posLevel}` },
-      );
-    }
-
-    if (isProbation) {
-      queryBuilder.andWhere(`profileEmployee.isProbation = ${isProbation}`);
-    }
-
-    if (retireType) {
-      queryBuilder.andWhere("profileEmployee.leaveType = :retireType", { retireType });
-    }
-
-    if (node !== null && node !== undefined && nodeId) {
-      const [nodeCondition, permissionCondition] = await Promise.all([
-        this.buildNodeCondition(node, nodeId, isAll),
-        this.buildPermissionCondition(_data, isAll),
-      ]);
-      // console.log("Permission Condition:", permissionCondition);
-      // console.log("Node Condition:", nodeCondition);
-
-      queryBuilder.andWhere(nodeCondition.condition, nodeCondition.params);
-
-      if (_data.privilege !== "OWNER" && _data.privilege !== "PARENT") {
-        queryBuilder.andWhere(permissionCondition.condition, permissionCondition.params);
+      if (posType) {
+        qb.andWhere("posType.posTypeName LIKE :keyword1", { keyword1: `${posType}` });
       }
+      if (posLevel) {
+        qb.andWhere(
+          "CONCAT(posType.posTypeShortName, ' ', posLevel.posLevelName) LIKE :keyword2",
+          { keyword2: `${posLevel}` },
+        );
+      }
+      if (isProbation !== undefined && isProbation !== null) {
+        qb.andWhere("profileEmployee.isProbation = :isProbation", { isProbation });
+      }
+      if (retireType) {
+        qb.andWhere("profileEmployee.leaveType = :retireType", { retireType });
+      }
+    };
+
+    // Compute permission/node conditions เพียงครั้งเดียว
+    const conditions: { condition: string; params: Record<string, any> }[] = [];
+    if (_data.privilege !== "OWNER" && _data.privilege !== "PARENT") {
+      conditions.push(await this.buildPermissionCondition(_data, isAll));
+    }
+    if (node !== null && node !== undefined && nodeId) {
+      conditions.push(await this.buildNodeCondition(node, nodeId, isAll));
+    }
+    const applyConditions = (qb: any) => {
+      for (const cond of conditions) {
+        qb.andWhere(cond.condition, cond.params);
+      }
+    };
+
+    // console.log(`[ProfileLeaveService] getLeaveEmployees conditions took ${Date.now() - t0}ms`);
+
+    // สร้าง salary EXISTS filter (ใช้ซ้ำทั้ง step1, step2)
+    const applySalaryFilter = (qb: any) => {
+      if (conditions.length > 0) {
+        let existsCond = "profileSalary.positionName != :notRetire";
+        const existsParams: Record<string, any> = { notRetire: "เกษียณอายุราชการ" };
+        for (const cond of conditions) {
+          existsCond += ` AND ${cond.condition}`;
+          Object.assign(existsParams, cond.params);
+        }
+        qb.andWhere(
+          `EXISTS (SELECT 1 FROM profileSalary WHERE profileEmployeeId = profileEmployee.id AND ${existsCond} AND profileSalary.\`order\` = (SELECT MAX(ps.\`order\`) FROM profileSalary ps WHERE ps.profileEmployeeId = profileEmployee.id AND ps.positionName != :notRetire2))`,
+          { ...existsParams, notRetire2: "เกษียณอายุราชการ" }
+        );
+      }
+    };
+
+    // Step 1: Count query
+    const countQb = this.profileEmployeeRepo
+      .createQueryBuilder("profileEmployee")
+      .leftJoinAndSelect("profileEmployee.posLevel", "posLevel")
+      .leftJoinAndSelect("profileEmployee.posType", "posType");
+    baseWhere(countQb);
+    applySalaryFilter(countQb);
+    const total = await countQb.getCount();
+
+    // console.log(`[ProfileLeaveService] getLeaveEmployees count took ${Date.now() - t0}ms, total=${total}`);
+
+    // Step 2: ดึงเฉพาะ profileEmployee IDs ที่ผ่านเงื่อนไข
+    const idQb = this.profileEmployeeRepo
+      .createQueryBuilder("profileEmployee")
+      .select(["profileEmployee.id"])
+      .leftJoin("profileEmployee.posLevel", "posLevel")
+      .leftJoin("profileEmployee.posType", "posType");
+    baseWhere(idQb);
+    applySalaryFilter(idQb);
+    idQb.orderBy(sortBy, sort).skip((page - 1) * pageSize).take(pageSize);
+    const rawIds = await idQb.getRawMany();
+    const employeeIds = rawIds.map((r) => r.profileEmployee_id);
+
+    // console.log(`[ProfileLeaveService] getLeaveEmployees ids took ${Date.now() - t0}ms, ids=${employeeIds.length}`);
+
+    if (employeeIds.length === 0) {
+      return { data: [], total };
     }
 
-    // เพิ่ม sorting และ pagination
-    queryBuilder
-      .orderBy(sortBy, sort)
-      .skip((page - 1) * pageSize)
-      .take(pageSize);
+    // Step 3: Load full data โดยไม่ JOIN salary
+    const records = await this.profileEmployeeRepo.find({
+      where: { id: In(employeeIds) },
+      relations: ["posLevel", "posType", "profileEmployeeEmployment"],
+      order: { [sortBy.split(".")[1]]: sort } as any,
+    });
 
-    const [records, total] = await queryBuilder.getManyAndCount();
+    // Step 4: Load salary เฉพาะ row ที่มี order สูงสุดต่อ profileEmployeeId (INNER JOIN + GROUP BY)
+    const salaries = await this.profileSalaryRepo
+      .createQueryBuilder("ps")
+      .innerJoin(
+        (subQuery) =>
+          subQuery
+            .select("ps2.profileEmployeeId", "pid")
+            .addSelect("MAX(ps2.order)", "maxOrd")
+            .from(ProfileSalary, "ps2")
+            .where("ps2.profileEmployeeId IN (:...employeeIds)", { employeeIds })
+            .andWhere("ps2.positionName != :notRetire", { notRetire: "เกษียณอายุราชการ" })
+            .groupBy("ps2.profileEmployeeId"),
+        "latest",
+        "latest.pid = ps.profileEmployeeId AND ps.order = latest.maxOrd"
+      )
+      .getMany();
 
-    // print query for debug
-    // console.log("SQL Query:", queryBuilder.getSql());
+    // สร้าง map: profileEmployeeId → salary ที่มี order สูงสุด
+    const salaryMap = new Map<string, ProfileSalary>();
+    for (const s of salaries) {
+      salaryMap.set(s.profileEmployeeId, s);
+    }
 
-    const data = await Promise.all(
-      records.map((record) => Promise.resolve(this.transformEmployeeData(record))),
-    );
+    // แปลงข้อมูลพร้อม salary
+    const data = records.map((record) => {
+      const salary = salaryMap.get(record.id);
+      if (salary) {
+        (record as any).profileSalary = [salary];
+      }
+      return this.transformEmployeeData(record);
+    });
 
+    // console.log(`[ProfileLeaveService] getLeaveEmployees total took ${Date.now() - t0}ms, total=${total}`);
     return { data, total };
   }
 
@@ -649,94 +675,143 @@ export class ProfileLeaveService {
       _data,
     } = filter;
 
+    const t0 = Date.now();
     const searchQuery = this.buildSearchQuery(searchField);
 
-    // สร้าง main query - เปลี่ยนจาก leftJoinAndSelect เป็น leftJoin สำหรับ profileSalary
-    const queryBuilder = this.profileRepo
-      .createQueryBuilder("profile")
-      .leftJoinAndSelect("profile.posLevel", "posLevel")
-      .leftJoinAndSelect("profile.posType", "posType")
-      .leftJoin(
-        "profile.profileSalary",
-        "profileSalary",
-        "profileSalary.order = (SELECT MAX(ps.order) FROM profileSalary ps WHERE ps.profileId = profile.id and ps.positionName != 'เกษียณอายุราชการ')",
-      )
-      .addSelect([
-        "profileSalary.id",
-        "profileSalary.order",
-        "profileSalary.posNo",
-        "profileSalary.posNoAbb",
-        "profileSalary.orgRoot",
-        "profileSalary.orgChild1",
-        "profileSalary.orgChild2",
-        "profileSalary.orgChild3",
-        "profileSalary.orgChild4",
-        "profileSalary.positionExecutive",
-      ])
-      .where(
-        new Brackets((qb) => {
-          qb.where("profile.isLeave = :isLeave", { isLeave: true }).orWhere(
+    // สร้าง base WHERE conditions แชร์ระหว่าง count/id/data query
+    const baseWhere = (qb: any) => {
+      qb.where(
+        new Brackets((qb2) => {
+          qb2.where("profile.isLeave = :isLeave", { isLeave: true }).orWhere(
             "profile.isRetirement = :isRetirement",
             { isRetirement: true },
           );
         }),
-      )
-      .andWhere(
-        new Brackets((qb) => {
-          qb.orWhere(searchKeyword && searchKeyword != "" ? searchQuery : "1=1", {
+      ).andWhere(
+        new Brackets((qb2) => {
+          qb2.orWhere(searchKeyword && searchKeyword != "" ? searchQuery : "1=1", {
             keyword: `%${searchKeyword}%`,
           });
         }),
       );
 
-    if (posType) {
-      queryBuilder.andWhere("posType.posTypeName LIKE :keyword1", { keyword1: `${posType}` });
-    }
-
-    if (posLevel) {
-      queryBuilder.andWhere("posLevel.posLevelName LIKE :keyword2", { keyword2: `${posLevel}` });
-    }
-
-    if (isProbation) {
-      queryBuilder.andWhere(`profile.isProbation = ${isProbation}`);
-    }
-
-    if (retireType) {
-      queryBuilder.andWhere("profile.leaveType = :retireType", { retireType });
-    }
-
-    // เพิ่ม permission และ node conditions
-    if (node !== null && node !== undefined && nodeId) {
-      // สร้าง query conditions แบบ parallel
-      const [nodeCondition, permissionCondition] = await Promise.all([
-        this.buildNodeCondition(node, nodeId, isAll),
-        this.buildPermissionCondition(_data, isAll),
-      ]);
-      console.log("Permission Condition:", permissionCondition);
-      console.log("Node Condition:", nodeCondition);
-
-      queryBuilder.andWhere(nodeCondition.condition, nodeCondition.params);
-
-      if (_data.privilege !== "OWNER" && _data.privilege !== "PARENT") {
-        queryBuilder.andWhere(permissionCondition.condition, permissionCondition.params);
+      if (posType) {
+        qb.andWhere("posType.posTypeName LIKE :keyword1", { keyword1: `${posType}` });
       }
+      if (posLevel) {
+        qb.andWhere("posLevel.posLevelName LIKE :keyword2", { keyword2: `${posLevel}` });
+      }
+      if (isProbation !== undefined && isProbation !== null) {
+        qb.andWhere("profile.isProbation = :isProbation", { isProbation });
+      }
+      if (retireType) {
+        qb.andWhere("profile.leaveType = :retireType", { retireType });
+      }
+    };
+
+    // Compute permission/node conditions เพียงครั้งเดียว
+    const conditions: { condition: string; params: Record<string, any> }[] = [];
+    if (_data.privilege !== "OWNER" && _data.privilege !== "PARENT") {
+      conditions.push(await this.buildPermissionCondition(_data, isAll));
+    }
+    if (node !== null && node !== undefined && nodeId) {
+      conditions.push(await this.buildNodeCondition(node, nodeId, isAll));
+    }
+    const applyConditions = (qb: any) => {
+      for (const cond of conditions) {
+        qb.andWhere(cond.condition, cond.params);
+      }
+    };
+
+    // console.log(`[ProfileLeaveService] getLeaveOfficer conditions took ${Date.now() - t0}ms`);
+
+    // สร้าง salary EXISTS filter (ใช้ซ้ำทั้ง step1, step2)
+    const applySalaryFilter = (qb: any) => {
+      if (conditions.length > 0) {
+        let existsCond = "profileSalary.positionName != :notRetire";
+        const existsParams: Record<string, any> = { notRetire: "เกษียณอายุราชการ" };
+        for (const cond of conditions) {
+          existsCond += ` AND ${cond.condition}`;
+          Object.assign(existsParams, cond.params);
+        }
+        qb.andWhere(
+          `EXISTS (SELECT 1 FROM profileSalary WHERE profileId = profile.id AND ${existsCond} AND profileSalary.\`order\` = (SELECT MAX(ps.\`order\`) FROM profileSalary ps WHERE ps.profileId = profile.id AND ps.positionName != :notRetire2))`,
+          { ...existsParams, notRetire2: "เกษียณอายุราชการ" }
+        );
+      }
+    };
+
+    // Step 1: Count query
+    const countQb = this.profileRepo
+      .createQueryBuilder("profile")
+      .leftJoinAndSelect("profile.posLevel", "posLevel")
+      .leftJoinAndSelect("profile.posType", "posType");
+    baseWhere(countQb);
+    applySalaryFilter(countQb);
+    const total = await countQb.getCount();
+
+    // console.log(`[ProfileLeaveService] getLeaveOfficer count took ${Date.now() - t0}ms, total=${total}`);
+
+    // Step 2: ดึงเฉพาะ profile IDs ที่ผ่านเงื่อนไข
+    const idQb = this.profileRepo
+      .createQueryBuilder("profile")
+      .select(["profile.id"])
+      .leftJoin("profile.posLevel", "posLevel")
+      .leftJoin("profile.posType", "posType");
+    baseWhere(idQb);
+    applySalaryFilter(idQb);
+    idQb.orderBy(sortBy, sort).skip((page - 1) * pageSize).take(pageSize);
+    const rawIds = await idQb.getRawMany();
+    const profileIds = rawIds.map((r) => r.profile_id);
+
+    // console.log(`[ProfileLeaveService] getLeaveOfficer ids took ${Date.now() - t0}ms, ids=${profileIds.length}`);
+
+    if (profileIds.length === 0) {
+      return { data: [], total };
     }
 
-    // เพิ่ม sorting และ pagination
-    queryBuilder
-      .orderBy(sortBy, sort)
-      .skip((page - 1) * pageSize)
-      .take(pageSize);
+    // Step 3: Load full data โดยไม่ JOIN salary
+    const records = await this.profileRepo.find({
+      where: { id: In(profileIds) },
+      relations: ["posLevel", "posType"],
+      order: { [sortBy.split(".")[1]]: sort } as any,
+    });
+    // console.log(`[ProfileLeaveService] getLeaveOfficer step3 (load profiles) took ${Date.now() - t0}ms`);
 
-    const [records, total] = await queryBuilder.getManyAndCount();
+    // Step 4: Load salary เฉพาะ row ที่มี order สูงสุดต่อ profileId (INNER JOIN + GROUP BY)
+    const salaries = await this.profileSalaryRepo
+      .createQueryBuilder("ps")
+      .innerJoin(
+        (subQuery) =>
+          subQuery
+            .select("ps2.profileId", "pid")
+            .addSelect("MAX(ps2.order)", "maxOrd")
+            .from(ProfileSalary, "ps2")
+            .where("ps2.profileId IN (:...profileIds)", { profileIds })
+            .andWhere("ps2.positionName != :notRetire", { notRetire: "เกษียณอายุราชการ" })
+            .groupBy("ps2.profileId"),
+        "latest",
+        "latest.pid = ps.profileId AND ps.order = latest.maxOrd"
+      )
+      .getMany();
+    // console.log(`[ProfileLeaveService] getLeaveOfficer step4 (load salaries) took ${Date.now() - t0}ms, salary rows=${salaries.length}`);
 
-    // print query for debug
-    // console.log("SQL Query:", queryBuilder.getSql());
+    // สร้าง map: profileId → salary ที่มี order สูงสุด
+    const salaryMap = new Map<string, ProfileSalary>();
+    for (const s of salaries) {
+      salaryMap.set(s.profileId, s);
+    }
 
-    const data = await Promise.all(
-      records.map((record) => Promise.resolve(this.transformOfficerData(record))),
-    );
+    // แปลงข้อมูลพร้อม salary
+    const data = records.map((record) => {
+      const salary = salaryMap.get(record.id);
+      if (salary) {
+        (record as any).profileSalary = [salary];
+      }
+      return this.transformOfficerData(record);
+    });
 
+    // console.log(`[ProfileLeaveService] getLeaveOfficer total took ${Date.now() - t0}ms, total=${total}`);
     return { data, total };
   }
 }