7 changed files with 191 additions and 181 deletions
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@ -41,6 +41,7 @@ import {
  removeProfileInOrganize,
  setLogDataDiff,
  checkReturnCommandType,
+  checkExceptCommandType,
  checkCommandType,
  removePostMasterAct,
  logPositionIsSelectedChange,
@ -4312,8 +4313,11 @@ export class CommandController extends Controller {
      body.data.map(async (item) => {
        const profile = await this.profileRepository.findOne({
          where: { id: item.profileId },
+          // relations: ["roleKeycloaks"],
          relations: {
-            roleKeycloaks: true
+            roleKeycloaks: true,
+            posType: true,
+            posLevel: true,
          },
        });
        if (!profile) {
@ -4609,8 +4613,6 @@ export class CommandController extends Controller {
                await this.positionRepository.save(positionNew, { data: req });
              }
              await CreatePosMasterHistoryOfficer(posMaster.id, req);
-              profile.posMasterNo = getPosMasterNo(posMaster);
-              profile.org = getOrgFullName(posMaster);
            }
            const newMapProfileSalary = {
              profileId: profile.id,
@ -5627,10 +5629,20 @@ export class CommandController extends Controller {
            _profile.lastUpdateFullName = req.user.name;
            _profile.lastUpdatedAt = new Date();
            if (item.isLeave == true) {
-              if (orgRevisionRef) {
-                await CreatePosMasterHistoryOfficer(orgRevisionRef.id, req, "DELETE");
+              const exceptClear = await checkExceptCommandType(String(item.commandId));
+              if (exceptClear.status) {
+                _profile.leaveReason = item.leaveReason ?? _null;
+                _profile.leaveCommandId = item.commandId ?? _null;
+                _profile.leaveCommandNo = `${item.commandNo}/${_commandYear}`;
+                _profile.leaveRemark = exceptClear.leaveRemark ?? _null;
+                _profile.leaveDate = item.commandDateAffect ?? _null;
+                _profile.leaveType = exceptClear.LeaveType ?? _null;
+              } else {
+                if (orgRevisionRef) {
+                  await CreatePosMasterHistoryOfficer(orgRevisionRef.id, req, "DELETE");
+                }
+                await removeProfileInOrganize(_profile.id, "OFFICER");
              }
-              await removeProfileInOrganize(_profile.id, "OFFICER");
            }
            const clearProfile = await checkCommandType(String(item.commandId));
            if (clearProfile.status) {
@ -5809,22 +5821,32 @@ export class CommandController extends Controller {
            _profile.lastUpdateFullName = req.user.name;
            _profile.lastUpdatedAt = new Date();
            if (item.isLeave == true) {
-              // บันทึกประวัติก่อนลบตำแหน่ง
-              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,
-                  },
+              const exceptClear = await checkExceptCommandType(String(item.commandId));
+              if (exceptClear.status) {
+                _profile.leaveReason = item.leaveReason ?? _null;
+                _profile.leaveCommandId = item.commandId ?? _null;
+                _profile.leaveCommandNo = `${item.commandNo}/${_commandYear}`;
+                _profile.leaveRemark = exceptClear.leaveRemark ?? _null;
+                _profile.leaveDate = item.commandDateAffect ?? _null;
+                _profile.leaveType = exceptClear.LeaveType ?? _null;
+              } else {
+                // บันทึกประวัติก่อนลบตำแหน่ง
+                const curRevision = await this.orgRevisionRepo.findOne({
+                  where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
                });
-                if (curPosMaster) {
-                  await CreatePosMasterHistoryEmployee(curPosMaster.id, req, "DELETE");
+                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");
              }
-              await removeProfileInOrganize(_profile.id, "EMPLOYEE");
            }
            const clearProfile = await checkCommandType(String(item.commandId));
            if (clearProfile.status) {
@ -6144,22 +6166,32 @@ export class CommandController extends Controller {
          _profile.lastUpdateFullName = req.user.name;
          _profile.lastUpdatedAt = new Date();
          if (item.isLeave == true) {
-            // บันทึกประวัติก่อนลบตำแหน่ง
-            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,
-                },
+            const exceptClear = await checkExceptCommandType(String(item.commandId));
+            if (exceptClear.status) {
+              _profile.leaveReason = item.leaveReason ?? _null;
+              _profile.leaveCommandId = item.commandId ?? _null;
+              _profile.leaveCommandNo = `${item.commandNo}/${_commandYear}`;
+              _profile.leaveRemark = exceptClear.leaveRemark ?? _null;
+              _profile.leaveDate = item.commandDateAffect ?? _null;
+              _profile.leaveType = exceptClear.LeaveType ?? _null;
+            } else {
+              // บันทึกประวัติก่อนลบตำแหน่ง
+              const curRevision = await this.orgRevisionRepo.findOne({
+                where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
              });
-              if (curPosMaster) {
-                await CreatePosMasterHistoryEmployee(curPosMaster.id, req, "DELETE");
+              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");
            }
-            await removeProfileInOrganize(_profile.id, "EMPLOYEE");
          }
          const clearProfile = await checkCommandType(String(item.commandId));
          if (clearProfile.status) {
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@ -2372,7 +2372,7 @@ export class OrganizationDotnetController extends Controller {
  @Security("internalAuth")
  async GetProfileForProcessCheckInAsync(@Path() keycloakId: string) {
    try {
-      // console.log(`[check-keycloak] START - keycloakId=${keycloakId}`);
+      console.log(`[check-keycloak] START - keycloakId=${keycloakId}`);

      /* =========================
       * 1. Load profile (Officer)
@ -2447,14 +2447,14 @@ export class OrganizationDotnetController extends Controller {
          child4DnaId: currentHolder?.orgChild4?.ancestorDNA ?? null,
        };

-        // console.log(
-        //   `[check-keycloak] SUCCESS_EMPLOYEE - keycloakId=${keycloakId}, profileType=EMPLOYEE`,
-        // );
+        console.log(
+          `[check-keycloak] SUCCESS_EMPLOYEE - keycloakId=${keycloakId}, profileType=EMPLOYEE`,
+        );

        return new HttpSuccess(mapProfile);
      }

-      // console.log(`[check-keycloak] OFFICER_FOUND - keycloakId=${keycloakId}`);
+      console.log(`[check-keycloak] OFFICER_FOUND - keycloakId=${keycloakId}`);

      /* =========================================
       * 2. current holder (Officer)
@ -2494,9 +2494,9 @@ export class OrganizationDotnetController extends Controller {
        child4DnaId: currentHolder?.orgChild4?.ancestorDNA ?? null,
      };

-      // console.log(
-      //   `[check-keycloak] SUCCESS_OFFICER - keycloakId=${keycloakId}, profileType=OFFICER`,
-      // );
+      console.log(
+        `[check-keycloak] SUCCESS_OFFICER - keycloakId=${keycloakId}, profileType=OFFICER`,
+      );

      return new HttpSuccess(mapProfile);
    } catch (error: any) {
@ -9151,30 +9151,4 @@ export class OrganizationDotnetController extends Controller {
    });
    return new HttpSuccess(filteredPosMasters);
  }
-
-  /**
-   * API ตรวจสอบ profileId ที่ลาออกแล้ว
-   * @summary API ตรวจสอบ profileId ที่ลาออกแล้ว
-   */
-  @Post("check-isLeave")
-  @Security("internalAuth")
-  async findProfileIsLeave(
-    @Body()
-    req: { profileIds: string[] }
-  ) {
-    const profile = await this.profileRepo.find({
-      select: { id: true },
-      where: { 
-        id: In(req.profileIds),
-        isLeave: true
-      }
-    });
-
-    if (profile.length === 0) {
-      return new HttpSuccess([]);
-    }
-
-    return new HttpSuccess(profile.map(p => p.id));
-  }
-
 }
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@ -5779,22 +5779,6 @@ export class ProfileController extends Controller {
    }
    const record = await this.profileRepo.findOneBy({ id });
    const before = structuredClone(record);
-    // เช็คว่ามี profileHistory ของ profile นี้หรือไม่
-    const historyCount = await this.profileHistoryRepo.count({
-      where: { profileId: id },
-    });
-
-    // ถ้าไม่มีเลย ให้บันทึกข้อมูลเริ่มต้น (ก่อน update) ลงไปก่อน
-    if (historyCount === 0) {
-      await this.profileHistoryRepo.save(
-        Object.assign(new ProfileHistory(), {
-          ...before,
-          birthDateOld: before?.birthDate,
-          profileId: id,
-          id: undefined,
-        }),
-      );
-    }

    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลโปรไฟล์นี้");

@ -7951,38 +7935,40 @@ export class ProfileController extends Controller {
        privacyUser: profile.privacyUser,
        privacyMgt: profile.privacyMgt,
        isDeputy: root?.isDeputy ?? false,
+        // root?.orgRootShortName && posMaster?.posMasterNo
+        //   ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
+        //   : "",
      };
-      const _numPart = posMaster ? [posMaster.posMasterNoPrefix, posMaster.posMasterNo, posMaster.posMasterNoSuffix].filter((p) => p !== null && p !== undefined && p !== '').join(' ') : '';
      if (_profile.child4Id != null) {
        _profile.node = 4;
        _profile.nodeId = _profile.child4Id;
        _profile.nodeDnaId = _profile.child4DnaId;
        _profile.nodeShortName = _profile.child4ShortName;
-        _profile.posNo = `${_profile.child4ShortName} ${_numPart}`;
+        _profile.posNo = `${_profile.child4ShortName} ${_profile.posMasterNo}`;
      } else if (_profile.child3Id != null) {
        _profile.node = 3;
        _profile.nodeId = _profile.child3Id;
        _profile.nodeDnaId = _profile.child3DnaId;
        _profile.nodeShortName = _profile.child3ShortName;
-        _profile.posNo = `${_profile.child3ShortName} ${_numPart}`;
+        _profile.posNo = `${_profile.child3ShortName} ${_profile.posMasterNo}`;
      } else if (_profile.child2Id != null) {
        _profile.node = 2;
        _profile.nodeId = _profile.child2Id;
        _profile.nodeDnaId = _profile.child2DnaId;
        _profile.nodeShortName = _profile.child2ShortName;
-        _profile.posNo = `${_profile.child2ShortName} ${_numPart}`;
+        _profile.posNo = `${_profile.child2ShortName} ${_profile.posMasterNo}`;
      } else if (_profile.child1Id != null) {
        _profile.node = 1;
        _profile.nodeId = _profile.child1Id;
        _profile.nodeDnaId = _profile.child1DnaId;
        _profile.nodeShortName = _profile.child1ShortName;
-        _profile.posNo = `${_profile.child1ShortName} ${_numPart}`;
+        _profile.posNo = `${_profile.child1ShortName} ${_profile.posMasterNo}`;
      } else if (_profile.rootId != null) {
        _profile.node = 0;
        _profile.nodeId = _profile.rootId;
        _profile.nodeDnaId = _profile.rootDnaId;
        _profile.nodeShortName = _profile.rootShortName;
-        _profile.posNo = `${_profile.rootShortName} ${_numPart}`;
+        _profile.posNo = `${_profile.rootShortName} ${_profile.posMasterNo}`;
      }
      return new HttpSuccess(_profile);
    }
@ -8122,39 +8108,41 @@ export class ProfileController extends Controller {
      privacyUser: profile.privacyUser,
      privacyMgt: profile.privacyMgt,
      isDeputy: root?.isDeputy ?? false,
+      // root?.orgRootShortName && posMaster?.posMasterNo
+      //   ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
+      //   : "",
    };

-    const _numPart = posMaster ? [posMaster.posMasterNoPrefix, posMaster.posMasterNo, posMaster.posMasterNoSuffix].filter((p) => p !== null && p !== undefined && p !== '').join(' ') : '';
    if (_profile.child4Id != null) {
      _profile.node = 4;
      _profile.nodeId = _profile.child4Id;
      _profile.nodeDnaId = _profile.child4DnaId;
      _profile.nodeShortName = _profile.child4ShortName;
-      _profile.posNo = `${_profile.child4ShortName} ${_numPart}`;
+      _profile.posNo = `${_profile.child4ShortName} ${posMaster?.posMasterNo}`;
    } else if (_profile.child3Id != null) {
      _profile.node = 3;
      _profile.nodeId = _profile.child3Id;
      _profile.nodeDnaId = _profile.child3DnaId;
      _profile.nodeShortName = _profile.child3ShortName;
-      _profile.posNo = `${_profile.child3ShortName} ${_numPart}`;
+      _profile.posNo = `${_profile.child3ShortName} ${posMaster?.posMasterNo}`;
    } else if (_profile.child2Id != null) {
      _profile.node = 2;
      _profile.nodeId = _profile.child2Id;
      _profile.nodeDnaId = _profile.child2DnaId;
      _profile.nodeShortName = _profile.child2ShortName;
-      _profile.posNo = `${_profile.child2ShortName} ${_numPart}`;
+      _profile.posNo = `${_profile.child2ShortName} ${posMaster?.posMasterNo}`;
    } else if (_profile.child1Id != null) {
      _profile.node = 1;
      _profile.nodeId = _profile.child1Id;
      _profile.nodeDnaId = _profile.child1DnaId;
      _profile.nodeShortName = _profile.child1ShortName;
-      _profile.posNo = `${_profile.child1ShortName} ${_numPart}`;
+      _profile.posNo = `${_profile.child1ShortName} ${posMaster?.posMasterNo}`;
    } else if (_profile.rootId != null) {
      _profile.node = 0;
      _profile.nodeId = _profile.rootId;
      _profile.nodeDnaId = _profile.rootDnaId;
      _profile.nodeShortName = _profile.rootShortName;
-      _profile.posNo = `${_profile.rootShortName} ${_numPart}`;
+      _profile.posNo = `${_profile.rootShortName} ${posMaster?.posMasterNo}`;
    }
    return new HttpSuccess(_profile);
  }
@ -9325,32 +9313,26 @@ export class ProfileController extends Controller {
          : "-",
    };

-    const _numPart = posMaster ? [posMaster.posMasterNoPrefix, posMaster.posMasterNo, posMaster.posMasterNoSuffix].filter((p) => p !== null && p !== undefined && p !== '').join(' ') : '';
    if (_profile.child4Id != null) {
      _profile.node = 4;
      _profile.nodeId = _profile.child4Id;
      _profile.nodeShortName = _profile.child4ShortName;
-      _profile.posNo = `${_profile.child4ShortName} ${_numPart}`;
    } else if (_profile.child3Id != null) {
      _profile.node = 3;
      _profile.nodeId = _profile.child3Id;
      _profile.nodeShortName = _profile.child3ShortName;
-      _profile.posNo = `${_profile.child3ShortName} ${_numPart}`;
    } else if (_profile.child2Id != null) {
      _profile.node = 2;
      _profile.nodeId = _profile.child2Id;
      _profile.nodeShortName = _profile.child2ShortName;
-      _profile.posNo = `${_profile.child2ShortName} ${_numPart}`;
    } else if (_profile.child1Id != null) {
      _profile.node = 1;
      _profile.nodeId = _profile.child1Id;
      _profile.nodeShortName = _profile.child1ShortName;
-      _profile.posNo = `${_profile.child1ShortName} ${_numPart}`;
    } else if (_profile.rootId != null) {
      _profile.node = 0;
      _profile.nodeId = _profile.rootId;
      _profile.nodeShortName = _profile.rootShortName;
-      _profile.posNo = `${_profile.rootShortName} ${_numPart}`;
    }
    return new HttpSuccess(_profile);
  }
@ -9531,28 +9513,38 @@ export class ProfileController extends Controller {
    const mapDataProfile = await Promise.all(
      findProfile.map(async (item: Profile) => {
        const fullName = `${item.prefix}${item.firstName} ${item.lastName}`;
-        const holder = item.current_holders?.find((x) => x.orgRevisionId == findRevision.id);
-        const _numPart = holder ? [holder.posMasterNoPrefix, holder.posMasterNo, holder.posMasterNoSuffix].filter((p) => p !== null && p !== undefined && p !== '').join(' ') : '';
-        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 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.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.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.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.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.orgRootShortName} ${item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
+                      : null;

        const root =
          item.current_holders.length == 0 ||
-            (holder != null &&
-              holder?.orgRoot == null)
+            (item.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
+              item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot == null)
            ? null
-            : holder?.orgRoot;
+            : item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;

        const rootHolder = item.current_holders?.find(
          (x) => x.orgRevisionId == findRevision.id,
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@ -2385,24 +2385,6 @@ export class ProfileEmployeeController extends Controller {
      Extension.CheckCitizen(body.citizenId);
    }
    const record = await this.profileRepo.findOneBy({ id });
-    const before = structuredClone(record);
-    // เช็คว่ามี profileHistory ของ profile นี้หรือไม่
-    const historyCount = await this.profileHistoryRepo.count({
-      where: { profileEmployeeId: id },
-    });
-
-    // ถ้าไม่มีเลย ให้บันทึกข้อมูลเริ่มต้น (ก่อน update) ลงไปก่อน
-    if (historyCount === 0) {
-      await this.profileHistoryRepo.save(
-        Object.assign(new ProfileEmployeeHistory(), {
-          ...before,
-          birthDateOld: before?.birthDate,
-          profileEmployeeId: id,
-          id: undefined,
-        }),
-      );
-    }
-
    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลโปรไฟล์นี้");

    if (body.employeeClass == null || body.employeeClass == undefined || body.employeeClass == "") {
@ -4021,38 +4003,40 @@ export class ProfileEmployeeController extends Controller {
      salary: profile ? profile.amount : null,
      amountSpecial: profile ? profile.amountSpecial : null,
      posNo: null,
+      // root?.orgRootShortName && posMaster?.posMasterNo
+      //   ? `${root?.orgRootShortName} ${posMaster?.posMasterNo}`
+      //   : "",
    };
-    const _numPart = posMaster ? [posMaster.posMasterNoPrefix, posMaster.posMasterNo, posMaster.posMasterNoSuffix].filter((p) => p !== null && p !== undefined && p !== '').join(' ') : '';
    if (_profile.child4Id != null) {
      _profile.node = 4;
      _profile.nodeId = _profile.child4Id;
      _profile.nodeDnaId = _profile.child4DnaId;
      _profile.nodeShortName = _profile.child4ShortName;
-      _profile.posNo = `${_profile.child4ShortName} ${_numPart}`;
+      _profile.posNo = `${_profile.child4ShortName} ${_profile.posMasterNo}`;
    } else if (_profile.child3Id != null) {
      _profile.node = 3;
      _profile.nodeId = _profile.child3Id;
      _profile.nodeDnaId = _profile.child3DnaId;
      _profile.nodeShortName = _profile.child3ShortName;
-      _profile.posNo = `${_profile.child3ShortName} ${_numPart}`;
+      _profile.posNo = `${_profile.child3ShortName} ${_profile.posMasterNo}`;
    } else if (_profile.child2Id != null) {
      _profile.node = 2;
      _profile.nodeId = _profile.child2Id;
      _profile.nodeDnaId = _profile.child2DnaId;
      _profile.nodeShortName = _profile.child2ShortName;
-      _profile.posNo = `${_profile.child2ShortName} ${_numPart}`;
+      _profile.posNo = `${_profile.child2ShortName} ${_profile.posMasterNo}`;
    } else if (_profile.child1Id != null) {
      _profile.node = 1;
      _profile.nodeId = _profile.child1Id;
      _profile.nodeDnaId = _profile.child1DnaId;
      _profile.nodeShortName = _profile.child1ShortName;
-      _profile.posNo = `${_profile.child1ShortName} ${_numPart}`;
+      _profile.posNo = `${_profile.child1ShortName} ${_profile.posMasterNo}`;
    } else if (_profile.rootId != null) {
      _profile.node = 0;
      _profile.nodeId = _profile.rootId;
      _profile.nodeDnaId = _profile.rootDnaId;
      _profile.nodeShortName = _profile.rootShortName;
-      _profile.posNo = `${_profile.rootShortName} ${_numPart}`;
+      _profile.posNo = `${_profile.rootShortName} ${_profile.posMasterNo}`;
    }
    return new HttpSuccess(_profile);
  }
@ -6460,7 +6444,33 @@ export class ProfileEmployeeController extends Controller {
        null
        ? null
        : profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4;
-    const _numPart = posMaster ? [posMaster.posMasterNoPrefix, posMaster.posMasterNo, posMaster.posMasterNoSuffix].filter((p) => p !== null && p !== undefined && p !== '').join(' ') : '';
+    const shortName =
+      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.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.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
+              ? `${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
+                ? `${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
+                  ? `${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgRoot.orgRootShortName} ${profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.posMasterNo}`
+                  : null;
    const _profile: any = {
      profileId: profile.id,
      prefix: profile.prefix,
@ -6502,7 +6512,7 @@ export class ProfileEmployeeController extends Controller {
      child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
      node: null,
      nodeId: null,
-      posNo: null,
+      posNo: shortName,
      salary: profile.amount,
      education:
        profile && profile.profileEducations.length > 0
@ -6517,27 +6527,22 @@ export class ProfileEmployeeController extends Controller {
      _profile.node = 4;
      _profile.nodeId = _profile.child4Id;
      _profile.nodeShortName = _profile.child4ShortName;
-      _profile.posNo = `${_profile.child4ShortName} ${_numPart}`;
    } else if (_profile.child3Id != null) {
      _profile.node = 3;
      _profile.nodeId = _profile.child3Id;
      _profile.nodeShortName = _profile.child3ShortName;
-      _profile.posNo = `${_profile.child3ShortName} ${_numPart}`;
    } else if (_profile.child2Id != null) {
      _profile.node = 2;
      _profile.nodeId = _profile.child2Id;
      _profile.nodeShortName = _profile.child2ShortName;
-      _profile.posNo = `${_profile.child2ShortName} ${_numPart}`;
    } else if (_profile.child1Id != null) {
      _profile.node = 1;
      _profile.nodeId = _profile.child1Id;
      _profile.nodeShortName = _profile.child1ShortName;
-      _profile.posNo = `${_profile.child1ShortName} ${_numPart}`;
    } else if (_profile.rootId != null) {
      _profile.node = 0;
      _profile.nodeId = _profile.rootId;
      _profile.nodeShortName = _profile.rootShortName;
-      _profile.posNo = `${_profile.rootShortName} ${_numPart}`;
    }
    return new HttpSuccess(_profile);
  }
--- a/src/controllers/ProfileEmployeeTempController.ts
+++ b/src/controllers/ProfileEmployeeTempController.ts
@ -1001,24 +1001,6 @@ export class ProfileEmployeeTempController extends Controller {
    }

    const record = await this.profileRepo.findOneBy({ id });
-    const before = structuredClone(record);
-    // เช็คว่ามี profileHistory ของ profile นี้หรือไม่
-    const historyCount = await this.profileHistoryRepo.count({
-      where: { profileEmployeeId: id },
-    });
-
-    // ถ้าไม่มีเลย ให้บันทึกข้อมูลเริ่มต้น (ก่อน update) ลงไปก่อน
-    if (historyCount === 0) {
-      await this.profileHistoryRepo.save(
-        Object.assign(new ProfileEmployeeHistory(), {
-          ...before,
-          birthDateOld: before?.birthDate,
-          profileEmployeeId: id,
-          id: undefined,
-        }),
-      );
-    }
-
    if (!record) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลโปรไฟล์นี้");

    if (body.employeeClass == null || body.employeeClass == undefined || body.employeeClass == "") {
--- a/src/interfaces/utils.ts
+++ b/src/interfaces/utils.ts
@ -326,7 +326,7 @@ export async function removeProfileInOrganize(profileId: string, type: string) {
    await AppDataSource.getRepository(EmployeePosMaster)
      .createQueryBuilder()
      .update(EmployeePosMaster)
-      .set({ current_holderId: null, isSit: false })
+      .set({ current_holderId: null })
      .where("id = :id", { id: findProfileInEmpPosMaster?.id })
      .execute();

@ -395,6 +395,43 @@ export async function checkReturnCommandType(commandId: string) {
  return true;
 }

+export async function checkExceptCommandType(commandId: string) {
+  const commandRepository = AppDataSource.getRepository(Command);
+  const commandReciveRepository = AppDataSource.getRepository(CommandRecive);
+  const _type = await commandRepository.findOne({
+    where: {
+      id: commandId,
+    },
+    relations: ["commandType"],
+  });
+  if (!["C-PM-25", "C-PM-26"].includes(String(_type?.commandType.code))) {
+    return { status: false, LeaveType: null, leaveRemark: null };
+  }
+  const _commandRecive = await commandReciveRepository.findOne({
+    where: { commandId: commandId },
+  });
+
+  let _leaveType: string = "";
+  switch (String(_type?.commandType.code)) {
+    case "C-PM-25": {
+      _leaveType = "DISCIPLINE_SUSPEND"; //คำสั่งพักจากราชการ
+      break;
+    }
+    case "C-PM-26": {
+      _leaveType = "DISCIPLINE_TEMP_SUSPEND"; //คำสั่งให้ออกจากราชการไว้ก่อน
+      break;
+    }
+    default: {
+      _leaveType = "";
+    }
+  }
+  return {
+    status: true,
+    LeaveType: _leaveType,
+    leaveRemark: _commandRecive ? _commandRecive.remarkVertical : null,
+  };
+}
+
 export async function checkCommandType(commandId: string) {
  const commandRepository = AppDataSource.getRepository(Command);
  const commandReciveRepository = AppDataSource.getRepository(CommandRecive);
@ -414,8 +451,6 @@ export async function checkCommandType(commandId: string) {
      "C-PM-23",
      "C-PM-19",
      "C-PM-20",
-      "C-PM-25",
-      "C-PM-26",
      "C-PM-43",
    ].includes(String(_type?.commandType.code))
  ) {
@ -465,16 +500,6 @@ export async function checkCommandType(commandId: string) {
      _retireTypeName = "ลาออกจากราชการ";
      break;
    }
-    case "C-PM-25": {
-      _leaveType = "DISCIPLINE_SUSPEND";
-      _retireTypeName = "พักจากราชการ";
-      break;
-    }
-    case "C-PM-26": {
-      _leaveType = "DISCIPLINE_TEMP_SUSPEND";
-      _retireTypeName = "ให้ออกจากราชการไว้ก่อน";
-      break;
-    }
    case "C-PM-43": {
      _leaveType = "RETIRE_OUT_EMP";
      _retireTypeName = "ให้ออกจากราชการ";
--- a/src/middlewares/authInternal.ts
+++ b/src/middlewares/authInternal.ts
@ -19,7 +19,7 @@ export async function handleInternalAuth(request: express.Request) {
    throw new HttpError(HttpStatus.UNAUTHORIZED, "Invalid API Key");
  }

-  // console.log(`[InternalAuth] Authentication successful`);
+  console.log(`[InternalAuth] Authentication successful`);

  return {
    sub: "internal_service",