From 378c941a0128c124cf5309b562a3b6821f08ab09 Mon Sep 17 00:00:00 2001
From: Adisak <adisak@frappet.com>
Date: Mon, 11 May 2026 14:33:50 +0700
Subject: [PATCH 1/3] fix: command C-PM-20 insert history

---
 src/controllers/CommandController.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index ca82faa3..232d2689 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -5450,6 +5450,21 @@ export class CommandController extends Controller {
                 _profile.leaveDate = item.commandDateAffect ?? _null;
                 _profile.leaveType = exceptClear.LeaveType ?? _null;
               } else {
+                // บันทึกประวัติก่อนลบตำแหน่ง
+                const curRevision = await this.orgRevisionRepo.findOne({
+                  where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
+                });
+                if (curRevision) {
+                  const curPosMaster = await this.employeePosMasterRepository.findOne({
+                    where: {
+                      current_holderId: _profile.id,
+                      orgRevisionId: curRevision.id,
+                    },
+                  });
+                  if (curPosMaster) {
+                    await CreatePosMasterHistoryEmployee(curPosMaster.id, req, "DELETE");
+                  }
+                }
                 await removeProfileInOrganize(_profile.id, "EMPLOYEE");
               }
             }

From 7e4dc6434fcbb48c46dff1c1c49710e3ff09ef11 Mon Sep 17 00:00:00 2001
From: Adisak <adisak@frappet.com>
Date: Mon, 11 May 2026 16:48:04 +0700
Subject: [PATCH 2/3] #2474

---
 src/controllers/ProfileController.ts          | 2459 +++++++++--------
 src/controllers/ProfileEmployeeController.ts  |   40 +-
 .../ProfileGovernmentEmployeeController.ts    |   14 +-
 3 files changed, 1252 insertions(+), 1261 deletions(-)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index c31d337d..e5afb054 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -204,7 +204,7 @@ export class ProfileController extends Controller {
           },
         });
         ImgUrl = response_.data.downloadUrl;
-      } catch {}
+      } catch { }
     }
     const province = await this.provinceRepository.findOneBy({
       id: profile.registrationProvinceId,
@@ -216,36 +216,36 @@ export class ProfileController 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;
 
@@ -293,38 +293,38 @@ export class ProfileController 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: [
@@ -342,20 +342,20 @@ export class ProfileController 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.degree : "-",
-          }))
+          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.degree : "-",
+        }))
         : [
-            {
-              institute: "-",
-              date: "-",
-              degree: "-",
-            },
-          ];
+          {
+            institute: "-",
+            date: "-",
+            degree: "-",
+          },
+        ];
 
     const mapData = {
       // Id: profile.id,
@@ -393,10 +393,10 @@ export class ProfileController 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
@@ -406,27 +406,22 @@ export class ProfileController 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") +
@@ -495,7 +490,7 @@ export class ProfileController extends Controller {
                 },
               });
               _ImgUrl[i] = response_.data.downloadUrl;
-            } catch {}
+            } catch { }
           }
         }),
       );
@@ -509,7 +504,7 @@ export class ProfileController extends Controller {
           },
         });
         ImgUrl = response_.data.downloadUrl;
-      } catch {}
+      } catch { }
     }
     const profileOc = await this.profileRepo.findOne({
       relations: [
@@ -547,36 +542,36 @@ export class ProfileController 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;
 
@@ -595,19 +590,19 @@ export class ProfileController 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", "name", "isDeleted"],
       where: { profileId: id, isDeleted: false },
@@ -616,34 +611,34 @@ export class ProfileController 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"],
@@ -653,19 +648,19 @@ export class ProfileController 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: Extension.ToThaiNumber(item.refCommandNo) ?? null,
-          }))
+          disciplineYear:
+            Extension.ToThaiNumber(new Date(item.refCommandDate).getFullYear().toString()) ??
+            null,
+          disciplineDetail: item.detail ?? null,
+          refNo: Extension.ToThaiNumber(item.refCommandNo) ?? null,
+        }))
         : [
-            {
-              disciplineYear: "-",
-              disciplineDetail: "-",
-              refNo: "-",
-            },
-          ];
+          {
+            disciplineYear: "-",
+            disciplineDetail: "-",
+            refNo: "-",
+          },
+        ];
 
     const education_raw = await this.profileEducationRepo.find({
       select: [
@@ -684,34 +679,34 @@ export class ProfileController 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",
@@ -731,45 +726,45 @@ export class ProfileController 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: {
@@ -783,37 +778,37 @@ export class ProfileController 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.find({
       relations: { leaveType: true },
@@ -823,19 +818,19 @@ export class ProfileController extends Controller {
     const leaves =
       leave_raw.length > 0
         ? leave_raw.map((item) => ({
-            leaveTypeName: item.leaveType.name,
-            dateLeaveStart: item.dateLeaveStart
-              ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart))
-              : "",
-            leaveDays: item.leaveDays ? Extension.ToThaiNumber(item.leaveDays.toString()) : "",
-          }))
+          leaveTypeName: item.leaveType.name,
+          dateLeaveStart: item.dateLeaveStart
+            ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateLeaveStart))
+            : "",
+          leaveDays: item.leaveDays ? Extension.ToThaiNumber(item.leaveDays.toString()) : "",
+        }))
         : [
-            {
-              leaveTypeName: "-",
-              dateLeaveStart: "-",
-              leaveDays: "-",
-            },
-          ];
+          {
+            leaveTypeName: "-",
+            dateLeaveStart: "-",
+            leaveDays: "-",
+          },
+        ];
 
     const data = {
       fullName: `${profiles?.prefix}${profiles?.firstName} ${profiles?.lastName}`,
@@ -862,20 +857,20 @@ export class ProfileController 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,
@@ -992,7 +987,7 @@ export class ProfileController extends Controller {
                 },
               });
               _ImgUrl[i] = response_.data.downloadUrl;
-            } catch {}
+            } catch { }
           }
         }),
       );
@@ -1006,7 +1001,7 @@ export class ProfileController extends Controller {
           },
         });
         ImgUrl = response_.data.downloadUrl;
-      } catch {}
+      } catch { }
     }
 
     const orgRevision = await this.orgRevisionRepo.findOne({
@@ -1033,43 +1028,43 @@ export class ProfileController extends Controller {
 
     const posMasterId =
       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)?.id;
 
     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;
 
@@ -1095,31 +1090,31 @@ export class ProfileController 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: { profileId: id, isDeleted: false },
@@ -1128,23 +1123,23 @@ export class ProfileController 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"],
@@ -1154,21 +1149,21 @@ export class ProfileController 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")
@@ -1180,21 +1175,21 @@ export class ProfileController 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",
@@ -1222,58 +1217,58 @@ export class ProfileController 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: [
@@ -1299,41 +1294,41 @@ export class ProfileController 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(
-                  `ราชกิจจานุเบกษา เล่มที่ ${item.volume ?? "-"} ตอนที่ ${item.section ?? "-"} ลว. ${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(
+              `ราชกิจจานุเบกษา เล่มที่ ${item.volume ?? "-"} ตอนที่ ${item.section ?? "-"} ลว. ${Extension.ToThaiFullDate2(item.refCommandDate)}`,
+            )
+            : "-",
+          note: item.note ? Extension.ToThaiNumber(item.note) : "",
+        }))
         : [
-            {
-              receiveDate: "",
-              insigniaName: "",
-              insigniaShortName: "",
-              insigniaTypeName: "",
-              no: "",
-              issue: "",
-              volumeNo: "",
-              volume: "",
-              section: "",
-              page: "",
-              refCommandDate: "",
-              note: "",
-            },
-          ];
+          {
+            receiveDate: "",
+            insigniaName: "",
+            insigniaShortName: "",
+            insigniaTypeName: "",
+            no: "",
+            issue: "",
+            volumeNo: "",
+            volume: "",
+            section: "",
+            page: "",
+            refCommandDate: "",
+            note: "",
+          },
+        ];
 
     const leave_raw = await this.profileLeaveRepository
       .createQueryBuilder("profileLeave")
@@ -1471,62 +1466,62 @@ export class ProfileController 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: { profileId: 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: { profileId: id, isDeleted: false },
       order: { createdAt: "ASC" },
@@ -1534,23 +1529,23 @@ export class ProfileController 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: { profileId: id },
@@ -1559,19 +1554,19 @@ export class ProfileController 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: [
@@ -1605,76 +1600,76 @@ export class ProfileController 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: "",
+          },
+        ];
 
     // ประวัติพ้นจากราชการ
     let retires = [];
@@ -1817,8 +1812,8 @@ export class ProfileController extends Controller {
           date:
             item.dateStart && item.dateEnd
               ? Extension.ToThaiNumber(
-                  `${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`,
-                )
+                `${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`,
+              )
               : item.dateStart
                 ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
                 : item.dateEnd
@@ -1870,8 +1865,8 @@ export class ProfileController extends Controller {
           date:
             item.dateStart && item.dateEnd
               ? Extension.ToThaiNumber(
-                  `${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`,
-                )
+                `${Extension.ToThaiFullDate2(item.dateStart)} - ${Extension.ToThaiFullDate2(item.dateEnd)}`,
+              )
               : item.dateStart
                 ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.dateStart))
                 : item.dateEnd
@@ -1895,36 +1890,36 @@ export class ProfileController 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: { profileId: id, isDeleted: false },
       order: { createdAt: "ASC" },
@@ -1932,49 +1927,49 @@ export class ProfileController 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: "",
-              level: "",
-            },
-          ];
+          {
+            year: "",
+            period: "",
+            point1: "",
+            point2: "",
+            pointSum: "",
+            pointSumTh: "",
+            level: "",
+          },
+        ];
     const profileAbility_raw = await this.profileAbilityRepo.find({
       where: { profileId: id },
       order: { createdAt: "ASC" },
@@ -1982,15 +1977,15 @@ export class ProfileController 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: {
@@ -2003,95 +1998,95 @@ export class ProfileController 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: "",
+          },
+        ];
 
     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 : ""),
+        )
         : "";
 
     let portfolios: any[] = [];
@@ -2100,7 +2095,7 @@ export class ProfileController extends Controller {
       .then((x) => {
         portfolios = Array.isArray(x) ? x : [];
       })
-      .catch(() => {});
+      .catch(() => { });
     if (portfolios.length == 0) {
       portfolios = [{ name: "", year: "", position: "" }];
     } else {
@@ -2178,24 +2173,24 @@ export class ProfileController 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 == false ? "ถึงแก่กรรม" : "มีชีวิต",
       motherFullName:
         profileFamilyMother?.motherPrefix ||
-        profileFamilyMother?.motherFirstName ||
-        profileFamilyMother?.motherLastName
+          profileFamilyMother?.motherFirstName ||
+          profileFamilyMother?.motherLastName
           ? `${profileFamilyMother?.motherPrefix ?? ""}${profileFamilyMother?.motherFirstName ?? ""} ${profileFamilyMother?.motherLastName ?? ""}`.trim()
           : null,
       motherLive:
         profileFamilyMother && profileFamilyMother?.motherLive == false ? "ถึงแก่กรรม" : "มีชีวิต",
       coupleFullName:
         profileFamilyCouple?.couplePrefix ||
-        profileFamilyCouple?.coupleFirstName ||
-        profileFamilyCouple?.coupleLastNameOld
+          profileFamilyCouple?.coupleFirstName ||
+          profileFamilyCouple?.coupleLastNameOld
           ? `${profileFamilyCouple?.couplePrefix ?? ""}${profileFamilyCouple?.coupleFirstName ?? ""} ${profileFamilyCouple?.coupleLastName ?? ""}`.trim()
           : null,
       coupleLastNameOld: profileFamilyCouple?.coupleLastNameOld ?? null,
@@ -2650,7 +2645,7 @@ export class ProfileController 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,
@@ -4032,24 +4027,24 @@ export class ProfileController 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;
     let position =
@@ -4168,24 +4163,24 @@ export class ProfileController 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;
     let position =
@@ -4299,24 +4294,24 @@ export class ProfileController 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;
     let position =
@@ -4430,24 +4425,24 @@ export class ProfileController 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;
     let position =
@@ -4561,24 +4556,24 @@ export class ProfileController 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;
     let position =
@@ -4691,24 +4686,24 @@ export class ProfileController 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;
     let position =
@@ -4815,24 +4810,24 @@ export class ProfileController 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;
     let position =
@@ -4938,24 +4933,24 @@ export class ProfileController 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;
     let position =
@@ -5061,24 +5056,24 @@ export class ProfileController 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;
 
@@ -5185,24 +5180,24 @@ export class ProfileController 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;
     let position =
@@ -5308,24 +5303,24 @@ export class ProfileController 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;
 
@@ -6090,75 +6085,75 @@ export class ProfileController extends Controller {
       record.map((_data) => {
         const posExecutive =
           _data.current_holders.length == 0 ||
-          _data.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
-          _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.positions.length == 0 ||
-          _data.current_holders
-            .find((x) => x.orgRevisionId == revisionId)
-            ?.positions.find((x: any) => x.positionIsSelected == true) == null ||
-          _data.current_holders
-            .find((x) => x.orgRevisionId == revisionId)
-            ?.positions.find((x: any) => x.positionIsSelected == true)?.posExecutive == null
+            _data.current_holders.find((x) => x.orgRevisionId == revisionId) == null ||
+            _data.current_holders.find((x) => x.orgRevisionId == revisionId)?.positions.length == 0 ||
+            _data.current_holders
+              .find((x) => x.orgRevisionId == revisionId)
+              ?.positions.find((x: any) => x.positionIsSelected == true) == null ||
+            _data.current_holders
+              .find((x) => x.orgRevisionId == revisionId)
+              ?.positions.find((x: any) => x.positionIsSelected == true)?.posExecutive == null
             ? null
             : _data.current_holders
-                .find((x) => x.orgRevisionId == revisionId)
-                ?.positions.find((x: any) => x.positionIsSelected == true)?.posExecutive
-                ?.posExecutiveName;
+              .find((x) => x.orgRevisionId == revisionId)
+              ?.positions.find((x: any) => x.positionIsSelected == true)?.posExecutive
+              ?.posExecutiveName;
 
         const shortName =
           _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;
         let _root = root?.orgRootName;
@@ -6637,6 +6632,8 @@ export class ProfileController extends Controller {
         "posType.posTypeName",
         "current_holders.orgRevisionId",
         "current_holders.posMasterNo",
+        "current_holders.posMasterNoPrefix",
+        "current_holders.posMasterNoSuffix",
         "orgRoot.id",
         "orgRoot.ancestorDNA",
         "orgRoot.orgRootName",
@@ -6676,7 +6673,7 @@ export class ProfileController 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 },
       )
@@ -7032,6 +7029,8 @@ export class ProfileController extends Controller {
         "posType.posTypeName",
         "current_holders.orgRevisionId",
         "current_holders.posMasterNo",
+        "current_holders.posMasterNoPrefix",
+        "current_holders.posMasterNoSuffix",
         "orgRoot.id",
         "orgRoot.ancestorDNA",
         "orgRoot.orgRootName",
@@ -7077,7 +7076,7 @@ export class ProfileController 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 },
       )
@@ -7154,18 +7153,20 @@ export class ProfileController extends Controller {
         .filter(Boolean)
         .join("\n");
 
+      const numPart = holder ? `${holder.posMasterNoPrefix ?? ''}${holder.posMasterNo ?? ''}${holder.posMasterNoSuffix ?? ''}` : '';
+
       const shortName = !holder
         ? null
         : holder.orgChild4 != null
-          ? `${holder.orgChild4.orgChild4ShortName} ${holder.posMasterNo}`
+          ? `${holder.orgChild4.orgChild4ShortName} ${numPart}`
           : holder.orgChild3 != null
-            ? `${holder.orgChild3.orgChild3ShortName} ${holder.posMasterNo}`
+            ? `${holder.orgChild3.orgChild3ShortName} ${numPart}`
             : holder.orgChild2 != null
-              ? `${holder.orgChild2.orgChild2ShortName} ${holder.posMasterNo}`
+              ? `${holder.orgChild2.orgChild2ShortName} ${numPart}`
               : holder.orgChild1 != null
-                ? `${holder.orgChild1.orgChild1ShortName} ${holder.posMasterNo}`
+                ? `${holder.orgChild1.orgChild1ShortName} ${numPart}`
                 : holder.orgRoot != null
-                  ? `${holder.orgRoot.orgRootShortName} ${holder.posMasterNo}`
+                  ? `${holder.orgRoot.orgRootShortName} ${numPart}`
                   : null;
 
       return {
@@ -7315,8 +7316,8 @@ export class ProfileController extends Controller {
                 .map((x) => x.next_holderId).length == 0
                 ? ["zxc"]
                 : orgRevision.posMasters
-                    .filter((x) => x.next_holderId != null)
-                    .map((x) => x.next_holderId),
+                  .filter((x) => x.next_holderId != null)
+                  .map((x) => x.next_holderId),
           });
         }),
       )
@@ -7612,8 +7613,8 @@ export class ProfileController extends Controller {
                 .map((x) => x.current_holderId).length == 0
                 ? ["zxc"]
                 : orgRevision.posMasters
-                    .filter((x) => x.current_holderId != null)
-                    .map((x) => x.current_holderId),
+                  .filter((x) => x.current_holderId != null)
+                  .map((x) => x.current_holderId),
           });
         }),
       )
@@ -7791,45 +7792,45 @@ export class ProfileController 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 ==
+          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;
+            ?.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;
+            ?.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;
+            ?.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;
+            ?.orgChild4;
 
       const position = await this.positionRepository.findOne({
         relations: ["posExecutive"],
@@ -7970,37 +7971,37 @@ export class ProfileController 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;
@@ -8238,36 +8239,36 @@ export class ProfileController 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;
@@ -8474,11 +8475,11 @@ export class ProfileController extends Controller {
 
     commanderRootName_ =
       commandProfile?.current_holders == null ||
-      commandProfile?.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-        ?.orgRoot == null
+        commandProfile?.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
+          ?.orgRoot == null
         ? null
         : commandProfile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-            ?.orgRoot;
+          ?.orgRoot;
     //find สังกัดผู้บังคับบัญชา
     const commanderPosMaster_ = await this.posMasterRepo.findOne({
       where: {
@@ -8522,11 +8523,11 @@ export class ProfileController extends Controller {
 
     commanderAboveRootName_ =
       commandAboveProfile?.current_holders == null ||
-      commandAboveProfile?.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-        ?.orgRoot == null
+        commandAboveProfile?.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
+          ?.orgRoot == null
         ? null
         : commandAboveProfile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)
-            ?.orgRoot;
+          ?.orgRoot;
     //find สังกัดผู้บังคับบัญชาเหนือไป1ขั้น
     const commanderAbovePosMaster_ = await this.posMasterRepo.findOne({
       where: {
@@ -8719,36 +8720,36 @@ export class ProfileController 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;
@@ -8762,27 +8763,27 @@ export class ProfileController 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 posMasterActs = await this.posMasterActRepository.find({
@@ -9043,36 +9044,36 @@ export class ProfileController 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;
@@ -9212,36 +9213,36 @@ export class ProfileController 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;
@@ -9432,7 +9433,7 @@ export class ProfileController 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 },
       )
@@ -9498,32 +9499,32 @@ export class ProfileController 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;
 
@@ -9957,7 +9958,7 @@ export class ProfileController 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,
@@ -10090,61 +10091,61 @@ export class ProfileController extends Controller {
       findProfile.map(async (item: Profile) => {
         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);
         const position =
           posMaster == null ||
-          item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.positions == null ||
-          item.current_holders?.find((x) => x.orgRevisionId == findRevision.id)?.positions.length ==
+            item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.positions == null ||
+            item.current_holders?.find((x) => x.orgRevisionId == findRevision.id)?.positions.length ==
             0 ||
-          item.current_holders
-            .find((x) => x.orgRevisionId == findRevision.id)
-            ?.positions?.find((position) => position.positionIsSelected == true) == null
+            item.current_holders
+              .find((x) => x.orgRevisionId == findRevision.id)
+              ?.positions?.find((position) => position.positionIsSelected == true) == null
             ? null
             : item.current_holders
-                .find((x) => x.orgRevisionId == findRevision.id)
-                ?.positions?.find((position) => position.positionIsSelected == true);
+              .find((x) => x.orgRevisionId == findRevision.id)
+              ?.positions?.find((position) => position.positionIsSelected == true);
         const posExecutive =
           position == null ||
-          item.current_holders
-            .find((x) => x.orgRevisionId == findRevision.id)
-            ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive ==
+            item.current_holders
+              .find((x) => x.orgRevisionId == findRevision.id)
+              ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive ==
             null ||
-          item.current_holders
-            .find((x) => x.orgRevisionId == findRevision.id)
-            ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
-            ?.posExecutiveName == null
+            item.current_holders
+              .find((x) => x.orgRevisionId == findRevision.id)
+              ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
+              ?.posExecutiveName == null
             ? null
             : item.current_holders
-                .find((x) => x.orgRevisionId == findRevision.id)
-                ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
-                .posExecutiveName;
+              .find((x) => x.orgRevisionId == findRevision.id)
+              ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
+              .posExecutiveName;
 
         const shortName =
           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;
 
@@ -10170,154 +10171,154 @@ export class ProfileController 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,
           root:
             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
-                  ?.id,
+                ?.id,
           orgChild1:
             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?.id,
+                ?.orgChild1?.id,
           orgChild2:
             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?.id,
+                ?.orgChild2?.id,
           orgChild3:
             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?.id,
+                ?.orgChild3?.id,
           orgChild4:
             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?.id,
+                ?.orgChild4?.id,
           rootDna:
             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
-                  ?.ancestorDNA,
+                ?.ancestorDNA,
           orgChild1Dna:
             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?.ancestorDNA,
+                ?.orgChild1?.ancestorDNA,
           orgChild2Dna:
             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?.ancestorDNA,
+                ?.orgChild2?.ancestorDNA,
           orgChild3Dna:
             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?.ancestorDNA,
+                ?.orgChild3?.ancestorDNA,
           orgChild4Dna:
             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?.ancestorDNA,
+                ?.orgChild4?.ancestorDNA,
         };
       }),
     );
@@ -10385,64 +10386,64 @@ export class ProfileController extends Controller {
       findProfile.map(async (item: Profile) => {
         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 posExecutive =
           position == null ||
-          item.current_holders
-            .find((x) => x.orgRevisionId == orgRevisionActive.id)
-            ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive ==
+            item.current_holders
+              .find((x) => x.orgRevisionId == orgRevisionActive.id)
+              ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive ==
             null ||
-          item.current_holders
-            .find((x) => x.orgRevisionId == orgRevisionActive.id)
-            ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
-            ?.posExecutiveName == null
+            item.current_holders
+              .find((x) => x.orgRevisionId == orgRevisionActive.id)
+              ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
+              ?.posExecutiveName == null
             ? null
             : item.current_holders
-                .find((x) => x.orgRevisionId == orgRevisionActive.id)
-                ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
-                .posExecutiveName;
+              .find((x) => x.orgRevisionId == orgRevisionActive.id)
+              ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
+              .posExecutiveName;
 
         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;
 
@@ -10464,54 +10465,54 @@ export class ProfileController 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,
         };
       }),
     );
@@ -10724,14 +10725,14 @@ export class ProfileController extends Controller {
       }
       const posExecutive =
         item.positions == null ||
-        item.positions?.find((position) => position.positionIsSelected == true) == null ||
-        item.positions?.find((position) => position.positionIsSelected == true)?.posExecutive ==
+          item.positions?.find((position) => position.positionIsSelected == true) == null ||
+          item.positions?.find((position) => position.positionIsSelected == true)?.posExecutive ==
           null ||
-        item.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
-          ?.posExecutiveName == null
+          item.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
+            ?.posExecutiveName == null
           ? null
           : item.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
-              .posExecutiveName;
+            .posExecutiveName;
 
       // const amount =
       //   item.current_holder == null || item.current_holder.profileSalary.length == 0
@@ -10810,7 +10811,7 @@ export class ProfileController 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: isSpecial,
@@ -10889,98 +10890,98 @@ export class ProfileController extends Controller {
         position == null || position.posExecutive == null ? null : position.posExecutive.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);
   }
@@ -11034,67 +11035,67 @@ export class ProfileController 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);
       const position =
         posMaster == null ||
-        item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.positions == null ||
-        item.current_holders?.find((x) => x.orgRevisionId == findRevision.id)?.positions.length ==
+          item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.positions == null ||
+          item.current_holders?.find((x) => x.orgRevisionId == findRevision.id)?.positions.length ==
           0 ||
-        item.current_holders
-          .find((x) => x.orgRevisionId == findRevision.id)
-          ?.positions?.find((position) => position.positionIsSelected == true) == null
+          item.current_holders
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true) == null
           ? null
           : item.current_holders
-              .find((x) => x.orgRevisionId == findRevision.id)
-              ?.positions?.find((position) => position.positionIsSelected == true);
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true);
       const posExecutive =
         position == null ||
-        item.current_holders
-          .find((x) => x.orgRevisionId == findRevision.id)
-          ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive ==
+          item.current_holders
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive ==
           null ||
-        item.current_holders
-          .find((x) => x.orgRevisionId == findRevision.id)
-          ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
-          ?.posExecutiveName == null
+          item.current_holders
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
+            ?.posExecutiveName == null
           ? null
           : item.current_holders
-              .find((x) => x.orgRevisionId == findRevision.id)
-              ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
-              .posExecutiveName;
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
+            .posExecutiveName;
 
       const positionExecutiveField =
         position == null ||
-        item.current_holders
-          .find((x) => x.orgRevisionId == findRevision.id)
-          ?.positions?.find((position) => position.positionIsSelected == true)
-          ?.positionExecutiveField == null ||
-        item.current_holders
-          .find((x) => x.orgRevisionId == findRevision.id)
-          ?.positions?.find((position) => position.positionIsSelected == true)
-          ?.positionExecutiveField == null
+          item.current_holders
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true)
+            ?.positionExecutiveField == null ||
+          item.current_holders
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true)
+            ?.positionExecutiveField == null
           ? null
           : item.current_holders
-              .find((x) => x.orgRevisionId == findRevision.id)
-              ?.positions?.find((position) => position.positionIsSelected == true)
-              ?.positionExecutiveField;
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true)
+            ?.positionExecutiveField;
 
       const positionArea =
         position == null ||
-        item.current_holders
-          .find((x) => x.orgRevisionId == findRevision.id)
-          ?.positions?.find((position) => position.positionIsSelected == true)?.positionArea ==
+          item.current_holders
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true)?.positionArea ==
           null ||
-        item.current_holders
-          .find((x) => x.orgRevisionId == findRevision.id)
-          ?.positions?.find((position) => position.positionIsSelected == true)?.positionArea == null
+          item.current_holders
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true)?.positionArea == null
           ? null
           : item.current_holders
-              .find((x) => x.orgRevisionId == findRevision.id)
-              ?.positions?.find((position) => position.positionIsSelected == true)?.positionArea;
+            .find((x) => x.orgRevisionId == findRevision.id)
+            ?.positions?.find((position) => position.positionIsSelected == true)?.positionArea;
 
       const posExecutiveId =
         position == null || position.posExecutive == null ? null : position.posExecutive.id;
@@ -11103,49 +11104,49 @@ export class ProfileController 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;
 
@@ -11271,24 +11272,24 @@ export class ProfileController 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;
     let position =
@@ -11476,32 +11477,32 @@ export class ProfileController 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;
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index bbf8d14a..c0b36961 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -3368,31 +3368,21 @@ export class ProfileEmployeeController extends Controller {
       .getManyAndCount();
     const data = await Promise.all(
       record.map((_data) => {
-        const shortName =
-          _data.current_holders.length == 0
-            ? null
-            : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 !=
-                  null
-              ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
-              : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                  _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                    ?.orgChild3 != null
-                ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
-                : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                    _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                      ?.orgChild2 != null
-                  ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
-                  : _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
-                      _data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
-                        ?.orgChild1 != null
-                    ? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
-                    : _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)?.orgRoot.orgRootShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
-                      : null;
+        const holder = _data.current_holders.find((x) => x.orgRevisionId == findRevision.id);
+        const numPart = holder ? `${holder.posMasterNoPrefix ?? ''}${holder.posMasterNo ?? ''}${holder.posMasterNoSuffix ?? ''}` : '';
+        const shortName = !holder
+          ? null
+          : holder.orgChild4 != null
+            ? `${holder.orgChild4.orgChild4ShortName} ${numPart}`
+            : holder.orgChild3 != null
+              ? `${holder.orgChild3.orgChild3ShortName} ${numPart}`
+              : holder.orgChild2 != null
+                ? `${holder.orgChild2.orgChild2ShortName} ${numPart}`
+                : holder.orgChild1 != null
+                  ? `${holder.orgChild1.orgChild1ShortName} ${numPart}`
+                  : holder.orgRoot != null
+                    ? `${holder.orgRoot.orgRootShortName} ${numPart}`
+                    : null;
         const dateEmployment =
           _data.profileEmployeeEmployment.length == 0
             ? null
diff --git a/src/controllers/ProfileGovernmentEmployeeController.ts b/src/controllers/ProfileGovernmentEmployeeController.ts
index 6709e5db..d97a452a 100644
--- a/src/controllers/ProfileGovernmentEmployeeController.ts
+++ b/src/controllers/ProfileGovernmentEmployeeController.ts
@@ -115,7 +115,7 @@ export class ProfileGovernmentEmployeeController extends Controller {
         record.posType == null && record.posLevel == null
           ? null
           : `${record.posType.posTypeShortName} ${record.posLevel.posLevelName}`, //ระดับ
-      posMasterNo: posMaster == null ? null : `${orgShortName} ${posMaster.posMasterNo}`, //เลขที่ตำแหน่ง
+      posMasterNo: posMaster == null ? null : `${orgShortName} ${posMaster.posMasterNoPrefix ?? ''}${posMaster.posMasterNo ?? ''}${posMaster.posMasterNoSuffix ?? ''}`, //เลขที่ตำแหน่ง
       posType: record.posType == null ? null : record.posType.posTypeName, //ประเภท
       dateLeave: record.birthDate == null ? null : calculateRetireDate(record.birthDate),
       dateRetireLaw: record.dateRetireLaw ?? null,
@@ -281,9 +281,9 @@ export class ProfileGovernmentEmployeeController extends Controller {
         record?.isLeave == false
           ? posMaster == null
             ? null
-            : `${orgShortName} ${posMaster.posMasterNo}`
-          : posNoLeave /*record && record?.profileSalary.length > 0 
-          ? `${record?.profileSalary[0].posNoAbb} ${record?.profileSalary[0].posNo}` 
+            : `${orgShortName} ${posMaster.posMasterNoPrefix ?? ''}${posMaster.posMasterNo ?? ''}${posMaster.posMasterNoSuffix ?? ''}`
+          : posNoLeave /*record && record?.profileSalary.length > 0
+          ? `${record?.profileSalary[0].posNoAbb} ${record?.profileSalary[0].posNo}`
           : null*/, //เลขที่ตำแหน่ง
       posType: record?.posType == null ? null : record?.posType.posTypeName, //ประเภท
       dateLeave: record?.birthDate == null ? null : calculateRetireDate(record?.birthDate), //วันเกษียณ
@@ -441,9 +441,9 @@ export class ProfileGovernmentEmployeeController extends Controller {
         record?.isLeave == false
           ? posMaster == null
             ? null
-            : `${orgShortName} ${posMaster.posMasterNo}`
-          : posNoLeave /*record && record.profileSalary.length > 0 
-            ? `${record?.profileSalary[0].posNoAbb} ${record?.profileSalary[0].posNo}` 
+            : `${orgShortName} ${posMaster.posMasterNoPrefix ?? ''}${posMaster.posMasterNo ?? ''}${posMaster.posMasterNoSuffix ?? ''}`
+          : posNoLeave /*record && record.profileSalary.length > 0
+            ? `${record?.profileSalary[0].posNoAbb} ${record?.profileSalary[0].posNo}`
             : null*/, //เลขที่ตำแหน่ง
       posType: record?.posType == null ? null : record?.posType.posTypeName, //ประเภท
       dateLeave: record?.birthDate == null ? null : calculateRetireDate(record?.birthDate), //วันเกษียณ

From bf0dbdf018e5cca459b59a404558486307fb88d1 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Mon, 11 May 2026 17:17:49 +0700
Subject: [PATCH 3/3] =?UTF-8?q?fixed=20PermissionDelete=20to=20PermissionU?=
 =?UTF-8?q?pdate=20=E0=B9=83=E0=B8=99=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99?=
 =?UTF-8?q?=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=A5=E0=B8=9A=E0=B8=84=E0=B8=99?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B9=81=E0=B8=A5=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B7=E0=B8=9A=E0=B8=97=E0=B8=AD=E0=B8=94=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/EmployeePositionController.ts | 89 ++++++++++---------
 .../EmployeeTempPositionController.ts         | 89 ++++++++++---------
 src/controllers/PositionController.ts         | 69 ++++++++------
 3 files changed, 130 insertions(+), 117 deletions(-)

diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts
index 7b09973e..6ead5522 100644
--- a/src/controllers/EmployeePositionController.ts
+++ b/src/controllers/EmployeePositionController.ts
@@ -1190,8 +1190,8 @@ export class EmployeePositionController extends Controller {
         _data.child1 != undefined && _data.child1 != null
           ? _data.child1[0] != null
             ? `posMaster.orgChild1Id IN (:...child1)`
-            // : `posMaster.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
-            : `posMaster.orgChild1Id is null`
+            : // : `posMaster.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
+              `posMaster.orgChild1Id is null`
           : "1=1",
         {
           child1: _data.child1,
@@ -1226,23 +1226,24 @@ export class EmployeePositionController extends Controller {
         {
           child4: _data.child4,
         },
-      )
+      );
 
     if (body.keyword != null && body.keyword != "") {
-      query.orWhere(
-        new Brackets((qb) => {
-          qb.andWhere(
-            body.keyword != null && body.keyword != ""
-              ? body.isAll == false
-                ? searchShortName
-                : `CASE WHEN posMaster.orgChild1 is null THEN ${searchShortName0} WHEN posMaster.orgChild2 is null THEN ${searchShortName1} WHEN posMaster.orgChild3 is null THEN ${searchShortName2} WHEN posMaster.orgChild4 is null THEN ${searchShortName3} ELSE ${searchShortName4} END LIKE '%${body.keyword}%'`
-              : "1=1",
-          )
-            .andWhere(checkChildConditions)
-            .andWhere(typeCondition)
-            .andWhere(revisionCondition);
-        }),
-      )
+      query
+        .orWhere(
+          new Brackets((qb) => {
+            qb.andWhere(
+              body.keyword != null && body.keyword != ""
+                ? body.isAll == false
+                  ? searchShortName
+                  : `CASE WHEN posMaster.orgChild1 is null THEN ${searchShortName0} WHEN posMaster.orgChild2 is null THEN ${searchShortName1} WHEN posMaster.orgChild3 is null THEN ${searchShortName2} WHEN posMaster.orgChild4 is null THEN ${searchShortName3} ELSE ${searchShortName4} END LIKE '%${body.keyword}%'`
+                : "1=1",
+            )
+              .andWhere(checkChildConditions)
+              .andWhere(typeCondition)
+              .andWhere(revisionCondition);
+          }),
+        )
         .orWhere(
           new Brackets((qb) => {
             qb.andWhere(
@@ -1287,7 +1288,7 @@ export class EmployeePositionController extends Controller {
               .andWhere(typeCondition)
               .andWhere(revisionCondition);
           }),
-        )
+        );
     }
 
     let [posMaster, total] = await query
@@ -1706,50 +1707,50 @@ export class EmployeePositionController extends Controller {
     const type0LastPosMasterNo =
       requestBody.type == 0
         ? await this.employeePosMasterRepository.find({
-          where: {
-            orgRootId: requestBody.id,
-            orgChild1Id: IsNull(),
-          },
-        })
+            where: {
+              orgRootId: requestBody.id,
+              orgChild1Id: IsNull(),
+            },
+          })
         : [];
 
     const type1LastPosMasterNo =
       requestBody.type == 1
         ? await this.employeePosMasterRepository.find({
-          where: {
-            orgChild1Id: requestBody.id,
-            orgChild2Id: IsNull(),
-          },
-        })
+            where: {
+              orgChild1Id: requestBody.id,
+              orgChild2Id: IsNull(),
+            },
+          })
         : [];
 
     const type2LastPosMasterNo =
       requestBody.type == 2
         ? await this.employeePosMasterRepository.find({
-          where: {
-            orgChild2Id: requestBody.id,
-            orgChild3Id: IsNull(),
-          },
-        })
+            where: {
+              orgChild2Id: requestBody.id,
+              orgChild3Id: IsNull(),
+            },
+          })
         : [];
 
     const type3LastPosMasterNo =
       requestBody.type == 3
         ? await this.employeePosMasterRepository.find({
-          where: {
-            orgChild3Id: requestBody.id,
-            orgChild4Id: IsNull(),
-          },
-        })
+            where: {
+              orgChild3Id: requestBody.id,
+              orgChild4Id: IsNull(),
+            },
+          })
         : [];
 
     const type4LastPosMasterNo =
       requestBody.type == 4
         ? await this.employeePosMasterRepository.find({
-          where: {
-            orgChild4Id: requestBody.id,
-          },
-        })
+            where: {
+              orgChild4Id: requestBody.id,
+            },
+          })
         : [];
 
     const allLastPosMasterNo = [
@@ -2413,7 +2414,7 @@ export class EmployeePositionController extends Controller {
    */
   @Post("profile/delete/{id}")
   async deleteEmpHolder(@Path() id: string, @Request() request: RequestWithUser) {
-    await new permission().PermissionDelete(request, "SYS_ORG_EMP");
+    await new permission().PermissionUpdate(request, "SYS_ORG_EMP");
     const dataMaster = await this.employeePosMasterRepository.findOne({
       where: { id: id },
       relations: ["positions", "orgRevision"],
@@ -2472,7 +2473,7 @@ export class EmployeePositionController extends Controller {
     @Body() requestBody: { draftPositionId: string; publishPositionId: string },
     @Request() request: RequestWithUser,
   ) {
-    await new permission().PermissionDelete(request, "SYS_ORG_EMP");
+    await new permission().PermissionUpdate(request, "SYS_ORG_EMP");
     const findDraft = await this.orgRevisionRepository.findOne({
       where: {
         orgRevisionIsDraft: true,
diff --git a/src/controllers/EmployeeTempPositionController.ts b/src/controllers/EmployeeTempPositionController.ts
index 69dc3b92..e5229e67 100644
--- a/src/controllers/EmployeeTempPositionController.ts
+++ b/src/controllers/EmployeeTempPositionController.ts
@@ -908,8 +908,8 @@ export class EmployeeTempPositionController extends Controller {
         _data.child1 != undefined && _data.child1 != null
           ? _data.child1[0] != null
             ? `posMaster.orgChild1Id IN (:...child1)`
-            // : `posMaster.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
-            : `posMaster.orgChild1Id is null`
+            : // : `posMaster.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
+              `posMaster.orgChild1Id is null`
           : "1=1",
         {
           child1: _data.child1,
@@ -944,23 +944,24 @@ export class EmployeeTempPositionController extends Controller {
         {
           child4: _data.child4,
         },
-      )
+      );
 
     if (body.keyword != null && body.keyword != "") {
-      query.orWhere(
-        new Brackets((qb) => {
-          qb.andWhere(
-            body.keyword != null && body.keyword != ""
-              ? body.isAll == false
-                ? searchShortName
-                : `CASE WHEN posMaster.orgChild1 is null THEN ${searchShortName0} WHEN posMaster.orgChild2 is null THEN ${searchShortName1} WHEN posMaster.orgChild3 is null THEN ${searchShortName2} WHEN posMaster.orgChild4 is null THEN ${searchShortName3} ELSE ${searchShortName4} END LIKE '%${body.keyword}%'`
-              : "1=1",
-          )
-            .andWhere(checkChildConditions)
-            .andWhere(typeCondition)
-            .andWhere(revisionCondition);
-        }),
-      )
+      query
+        .orWhere(
+          new Brackets((qb) => {
+            qb.andWhere(
+              body.keyword != null && body.keyword != ""
+                ? body.isAll == false
+                  ? searchShortName
+                  : `CASE WHEN posMaster.orgChild1 is null THEN ${searchShortName0} WHEN posMaster.orgChild2 is null THEN ${searchShortName1} WHEN posMaster.orgChild3 is null THEN ${searchShortName2} WHEN posMaster.orgChild4 is null THEN ${searchShortName3} ELSE ${searchShortName4} END LIKE '%${body.keyword}%'`
+                : "1=1",
+            )
+              .andWhere(checkChildConditions)
+              .andWhere(typeCondition)
+              .andWhere(revisionCondition);
+          }),
+        )
         .orWhere(
           new Brackets((qb) => {
             qb.andWhere(
@@ -1005,7 +1006,7 @@ export class EmployeeTempPositionController extends Controller {
               .andWhere(typeCondition)
               .andWhere(revisionCondition);
           }),
-        )
+        );
     }
 
     let [posMaster, total] = await query
@@ -1421,50 +1422,50 @@ export class EmployeeTempPositionController extends Controller {
     const type0LastPosMasterNo =
       requestBody.type == 0
         ? await this.employeeTempPosMasterRepository.find({
-          where: {
-            orgRootId: requestBody.id,
-            orgChild1Id: IsNull(),
-          },
-        })
+            where: {
+              orgRootId: requestBody.id,
+              orgChild1Id: IsNull(),
+            },
+          })
         : [];
 
     const type1LastPosMasterNo =
       requestBody.type == 1
         ? await this.employeeTempPosMasterRepository.find({
-          where: {
-            orgChild1Id: requestBody.id,
-            orgChild2Id: IsNull(),
-          },
-        })
+            where: {
+              orgChild1Id: requestBody.id,
+              orgChild2Id: IsNull(),
+            },
+          })
         : [];
 
     const type2LastPosMasterNo =
       requestBody.type == 2
         ? await this.employeeTempPosMasterRepository.find({
-          where: {
-            orgChild2Id: requestBody.id,
-            orgChild3Id: IsNull(),
-          },
-        })
+            where: {
+              orgChild2Id: requestBody.id,
+              orgChild3Id: IsNull(),
+            },
+          })
         : [];
 
     const type3LastPosMasterNo =
       requestBody.type == 3
         ? await this.employeeTempPosMasterRepository.find({
-          where: {
-            orgChild3Id: requestBody.id,
-            orgChild4Id: IsNull(),
-          },
-        })
+            where: {
+              orgChild3Id: requestBody.id,
+              orgChild4Id: IsNull(),
+            },
+          })
         : [];
 
     const type4LastPosMasterNo =
       requestBody.type == 4
         ? await this.employeeTempPosMasterRepository.find({
-          where: {
-            orgChild4Id: requestBody.id,
-          },
-        })
+            where: {
+              orgChild4Id: requestBody.id,
+            },
+          })
         : [];
 
     const allLastPosMasterNo = [
@@ -2118,7 +2119,7 @@ export class EmployeeTempPositionController extends Controller {
    */
   @Post("profile/delete/{id}")
   async deleteEmpHolder(@Path() id: string, @Request() request: RequestWithUser) {
-    await new permission().PermissionDelete(request, "SYS_ORG_TEMP");
+    await new permission().PermissionUpdate(request, "SYS_ORG_TEMP");
     const dataMaster = await this.employeeTempPosMasterRepository.findOne({
       where: { id: id },
       relations: ["positions", "orgRevision"],
@@ -2179,7 +2180,7 @@ export class EmployeeTempPositionController extends Controller {
     @Body() requestBody: { draftPositionId: string; publishPositionId: string },
     @Request() request: RequestWithUser,
   ) {
-    await new permission().PermissionDelete(request, "SYS_ORG_TEMP");
+    await new permission().PermissionUpdate(request, "SYS_ORG_TEMP");
     const findDraft = await this.orgRevisionRepository.findOne({
       where: {
         orgRevisionIsDraft: true,
diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts
index 96576db8..98120f30 100644
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@@ -2421,7 +2421,7 @@ export class PositionController extends Controller {
           ? _data.child1[0] != null
             ? "posMaster.orgChild1Id IN (:...child1)"
             : // : `posMaster.orgChild1Id is ${_data.privilege == "PARENT" ? "not null" : "null"}`
-            `posMaster.orgChild1Id is null`
+              `posMaster.orgChild1Id is null`
           : "1=1",
         { child1: _data.child1 },
       )
@@ -2983,50 +2983,50 @@ export class PositionController extends Controller {
     const type0LastPosMasterNo =
       requestBody.type == 0
         ? await this.posMasterRepository.find({
-          where: {
-            orgRootId: requestBody.id,
-            orgChild1Id: IsNull(),
-          },
-        })
+            where: {
+              orgRootId: requestBody.id,
+              orgChild1Id: IsNull(),
+            },
+          })
         : [];
 
     const type1LastPosMasterNo =
       requestBody.type == 1
         ? await this.posMasterRepository.find({
-          where: {
-            orgChild1Id: requestBody.id,
-            orgChild2Id: IsNull(),
-          },
-        })
+            where: {
+              orgChild1Id: requestBody.id,
+              orgChild2Id: IsNull(),
+            },
+          })
         : [];
 
     const type2LastPosMasterNo =
       requestBody.type == 2
         ? await this.posMasterRepository.find({
-          where: {
-            orgChild2Id: requestBody.id,
-            orgChild3Id: IsNull(),
-          },
-        })
+            where: {
+              orgChild2Id: requestBody.id,
+              orgChild3Id: IsNull(),
+            },
+          })
         : [];
 
     const type3LastPosMasterNo =
       requestBody.type == 3
         ? await this.posMasterRepository.find({
-          where: {
-            orgChild3Id: requestBody.id,
-            orgChild4Id: IsNull(),
-          },
-        })
+            where: {
+              orgChild3Id: requestBody.id,
+              orgChild4Id: IsNull(),
+            },
+          })
         : [];
 
     const type4LastPosMasterNo =
       requestBody.type == 4
         ? await this.posMasterRepository.find({
-          where: {
-            orgChild4Id: requestBody.id,
-          },
-        })
+            where: {
+              orgChild4Id: requestBody.id,
+            },
+          })
         : [];
 
     const allLastPosMasterNo = [
@@ -3364,7 +3364,15 @@ export class PositionController extends Controller {
             if (orgRevision?.orgRevisionIsCurrent) {
               const pmWithOrg = await this.posMasterRepository.findOne({
                 where: { id: posMaster.id },
-                relations: ["orgRoot", "orgChild1", "orgChild2", "orgChild3", "orgChild4", "positions", "positions.posExecutive"],
+                relations: [
+                  "orgRoot",
+                  "orgChild1",
+                  "orgChild2",
+                  "orgChild3",
+                  "orgChild4",
+                  "positions",
+                  "positions.posExecutive",
+                ],
               });
               const _profile = await this.profileRepository.findOne({
                 where: { id: posMaster.current_holderId },
@@ -3375,13 +3383,16 @@ export class PositionController extends Controller {
                 _profile.org = getOrgFullName(pmWithOrg) ?? _null;
                 // ถ้าไม่ใช่ตำแหน่งนั่งทับ (isSit = false) ถึงจะอัพเดทตำแหน่งในทะเบียนประวัติ
                 if (!pmWithOrg.isSit) {
-                  const selectedPos = (pmWithOrg as any).positions?.find((p: any) => p.positionIsSelected === true);
+                  const selectedPos = (pmWithOrg as any).positions?.find(
+                    (p: any) => p.positionIsSelected === true,
+                  );
                   if (selectedPos) {
                     _profile.position = selectedPos.positionName ?? _null;
                     _profile.posTypeId = selectedPos.posTypeId ?? _null;
                     _profile.posLevelId = selectedPos.posLevelId ?? _null;
                     _profile.positionField = selectedPos.positionField ?? _null;
-                    _profile.posExecutive = (selectedPos as any).posExecutive?.posExecutiveName ?? _null;
+                    _profile.posExecutive =
+                      (selectedPos as any).posExecutive?.posExecutiveName ?? _null;
                     _profile.positionArea = selectedPos.positionArea ?? _null;
                     _profile.positionExecutiveField = selectedPos.positionExecutiveField ?? _null;
                   }
@@ -3932,7 +3943,7 @@ export class PositionController extends Controller {
    */
   @Post("profile/delete/{id}")
   async deleteHolder(@Path() id: string, @Request() request: RequestWithUser) {
-    await new permission().PermissionDelete(request, "SYS_ORG");
+    await new permission().PermissionUpdate(request, "SYS_ORG");
     const dataMaster = await this.posMasterRepository.findOne({
       where: { id: id },
       relations: ["positions", "orgRevision"],