diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 9e654ffe..033e9133 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -39,6 +39,7 @@ import {
   commandTypePath,
   removeProfileInOrganize,
   setLogDataDiff,
+  checkExceptCommandType,
   checkCommandType,
 } from "../interfaces/utils";
 import { Position } from "../entities/Position";
@@ -2113,7 +2114,7 @@ export class CommandController extends Controller {
         // ประวัติตำแหน่ง
         const data = new ProfileSalary();
         const meta = {
-          profileId: item.profileId,
+          profileId: profile.id,
           date: item.date,
           refCommandNo: item.refCommandNo,
           templateDoc: item.salaryRef,
@@ -2185,7 +2186,8 @@ export class CommandController extends Controller {
           profile.lastUpdateUserId = req.user.sub;
           profile.lastUpdateFullName = req.user.name;
           profile.lastUpdatedAt = new Date();
-          if (item.isLeave == true) {
+          const exceptClear = await checkExceptCommandType(String(item.commandId));
+          if (item.isLeave == true && !exceptClear) {
             await removeProfileInOrganize(profile.id, "OFFICER");
           }
           const clearProfile = await checkCommandType(String(item.commandId));
diff --git a/src/interfaces/utils.ts b/src/interfaces/utils.ts
index 826df67f..1c31504c 100644
--- a/src/interfaces/utils.ts
+++ b/src/interfaces/utils.ts
@@ -175,6 +175,20 @@ export async function removeProfileInOrganize(profileId: string, type: string) {
   }
 }
 
+export async function checkExceptCommandType(commandId: string) {
+  const commandRepository = AppDataSource.getRepository(Command);
+  const _type = await commandRepository.findOne({
+    where: {
+      id: commandId
+    },
+    relations: ["commandType"],
+  });
+  if (!["C-PM-25", "C-PM-26"].includes(String(_type?.commandType.code))) {
+    return false;
+  }
+  return true;
+}
+
 export async function checkCommandType(commandId: string) {
   const commandRepository = AppDataSource.getRepository(Command);
   const _type = await commandRepository.findOne({