diff --git a/src/controllers/ImportDataController.ts b/src/controllers/ImportDataController.ts
index b424edbb..4220a120 100644
--- a/src/controllers/ImportDataController.ts
+++ b/src/controllers/ImportDataController.ts
@@ -7052,16 +7052,16 @@ export class ImportDataController extends Controller {
       salaryTemp.lastUpdateUserId = req.user?.sub || "";
       salaryTemp.lastUpdateFullName = req.user?.name || "System Administrator";
 
-      // 12,15,16 isGovernment = false & dateGovernment = salaryTemp.commandDateAffect
-      if (["12", "15", "16"].includes(salaryTemp.commandCode ?? "")) {
-        salaryTemp.isGovernment = false;
-        salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
-      }
-      // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = salaryTemp.commandDateAffect
-      else if (["1", "2", "3", "4", "10", "11", "20"].includes(salaryTemp.commandCode ?? "")) {
-        salaryTemp.isGovernment = true;
-        salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
-      }
+      // // 12,15,16 isGovernment = false & dateGovernment = salaryTemp.commandDateAffect
+      // if (["12", "15", "16"].includes(salaryTemp.commandCode ?? "")) {
+      //   salaryTemp.isGovernment = false;
+      //   salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
+      // }
+      // // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = salaryTemp.commandDateAffect
+      // else if (["1", "2", "3", "4", "10", "11", "20"].includes(salaryTemp.commandCode ?? "")) {
+      //   salaryTemp.isGovernment = true;
+      //   salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
+      // }
 
       salaryTemps.push(salaryTemp);
     }
@@ -7312,16 +7312,16 @@ export class ImportDataController extends Controller {
       salaryTemp.lastUpdateUserId = req.user?.sub || "";
       salaryTemp.lastUpdateFullName = req.user?.name || "System Administrator";
 
-      // 12,15,16 isGovernment = false & dateGovernment = salaryTemp.commandDateAffect
-      if (["12", "15", "16"].includes(salaryTemp.commandCode ?? "")) {
-        salaryTemp.isGovernment = false;
-        salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
-      }
-      // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = salaryTemp.commandDateAffect
-      else if (["1", "2", "3", "4", "10", "11", "20"].includes(salaryTemp.commandCode ?? "")) {
-        salaryTemp.isGovernment = true;
-        salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
-      }
+      // // 12,15,16 isGovernment = false & dateGovernment = salaryTemp.commandDateAffect
+      // if (["12", "15", "16"].includes(salaryTemp.commandCode ?? "")) {
+      //   salaryTemp.isGovernment = false;
+      //   salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
+      // }
+      // // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = salaryTemp.commandDateAffect
+      // else if (["1", "2", "3", "4", "10", "11", "20"].includes(salaryTemp.commandCode ?? "")) {
+      //   salaryTemp.isGovernment = true;
+      //   salaryTemp.dateGovernment = salaryTemp.commandDateAffect;
+      // }
       salaryTemps.push(salaryTemp);
     }
 
diff --git a/src/controllers/ProfileSalaryController.ts b/src/controllers/ProfileSalaryController.ts
index 814f5e89..b5334244 100644
--- a/src/controllers/ProfileSalaryController.ts
+++ b/src/controllers/ProfileSalaryController.ts
@@ -919,16 +919,16 @@ export class ProfileSalaryController extends Controller {
       else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
     }
     Object.assign(data, { ...body, ...meta });
-    // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
-    if (["12", "15", "16"].includes(body.commandCode ?? "")) {
-      data.isGovernment = false;
-      if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
-    }
-    // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
-    else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
-      data.isGovernment = true;
-      if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
-    }
+    // // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
+    // if (["12", "15", "16"].includes(body.commandCode ?? "")) {
+    //   data.isGovernment = false;
+    //   if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
+    // }
+    // // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
+    // else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
+    //   data.isGovernment = true;
+    //   if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
+    // }
 
     const history = new ProfileSalaryHistory();
     Object.assign(history, { ...data, id: undefined });
@@ -1054,16 +1054,16 @@ export class ProfileSalaryController extends Controller {
       else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
     }
     Object.assign(record, body);
-    // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
-    if (["12", "15", "16"].includes(body.commandCode ?? "")) {
-      record.isGovernment = false;
-      if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
-    }
-    // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
-    else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
-      record.isGovernment = true;
-      if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
-    }
+    // // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
+    // if (["12", "15", "16"].includes(body.commandCode ?? "")) {
+    //   record.isGovernment = false;
+    //   if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
+    // }
+    // // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
+    // else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
+    //   record.isGovernment = true;
+    //   if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
+    // }
 
     Object.assign(history, { ...record, id: undefined });
 
diff --git a/src/controllers/ProfileSalaryEmployeeController.ts b/src/controllers/ProfileSalaryEmployeeController.ts
index 44b93a5d..8277060f 100644
--- a/src/controllers/ProfileSalaryEmployeeController.ts
+++ b/src/controllers/ProfileSalaryEmployeeController.ts
@@ -403,16 +403,16 @@ export class ProfileSalaryEmployeeController extends Controller {
       else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
     }
     Object.assign(data, { ...body, ...meta });
-    // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
-    if (["12", "15", "16"].includes(body.commandCode ?? "")) {
-      data.isGovernment = false;
-      if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
-    }
-    // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
-    else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
-      data.isGovernment = true;
-      if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
-    }
+    // // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
+    // if (["12", "15", "16"].includes(body.commandCode ?? "")) {
+    //   data.isGovernment = false;
+    //   if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
+    // }
+    // // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
+    // else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
+    //   data.isGovernment = true;
+    //   if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
+    // }
 
     const history = new ProfileSalaryHistory();
     Object.assign(history, { ...data, id: undefined });
@@ -548,16 +548,16 @@ export class ProfileSalaryEmployeeController extends Controller {
       else if (body.commandCode == "19") body.commandName = "ไม่ได้เลื่อนเงินเดือน/ค่าจ้าง";
     }
     Object.assign(record, body);
-    // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
-    if (["12", "15", "16"].includes(body.commandCode ?? "")) {
-      record.isGovernment = false;
-      if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect ?? null;
-    }
-    // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
-    else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
-      record.isGovernment = true;
-      if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect ?? null;
-    }
+    // // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
+    // if (["12", "15", "16"].includes(body.commandCode ?? "")) {
+    //   record.isGovernment = false;
+    //   if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect ?? null;
+    // }
+    // // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
+    // else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
+    //   record.isGovernment = true;
+    //   if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect ?? null;
+    // }
     Object.assign(history, { ...record, id: undefined });
 
     history.profileSalaryId = salaryId;
diff --git a/src/controllers/ProfileSalaryTempController.ts b/src/controllers/ProfileSalaryTempController.ts
index 42cffe41..50423bed 100644
--- a/src/controllers/ProfileSalaryTempController.ts
+++ b/src/controllers/ProfileSalaryTempController.ts
@@ -1233,13 +1233,13 @@ export class ProfileSalaryTempController extends Controller {
       isDelete: false,
     };
     Object.assign(data, { ...body, ...meta });
-    if (["12", "15", "16"].includes(body.commandCode ?? "")) {
-      data.isGovernment = false;
-      if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
-    } else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
-      data.isGovernment = true;
-      if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
-    }
+    // if (["12", "15", "16"].includes(body.commandCode ?? "")) {
+    //   data.isGovernment = false;
+    //   if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
+    // } else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
+    //   data.isGovernment = true;
+    //   if (body.commandDateAffect) data.dateGovernment = body.commandDateAffect;
+    // }
     await this.salaryRepo.save(data, { data: req });
     setLogDataDiff(req, { before, after: data });
 
@@ -1516,16 +1516,16 @@ export class ProfileSalaryTempController extends Controller {
     const before = structuredClone(record);
 
     Object.assign(record, body);
-    // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
-    if (["12", "15", "16"].includes(body.commandCode ?? "")) {
-      record.isGovernment = false;
-      if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
-    }
-    // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
-    else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
-      record.isGovernment = true;
-      if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
-    }
+    // // 12,15,16 isGovernment = false & dateGovernment = commandDateAffect
+    // if (["12", "15", "16"].includes(body.commandCode ?? "")) {
+    //   record.isGovernment = false;
+    //   if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
+    // }
+    // // 1,2,3,4,10,11,20 isGovernment = true & dateGovernment = commandDateAffect
+    // else if (["1", "2", "3", "4", "10", "11", "20"].includes(body.commandCode ?? "")) {
+    //   record.isGovernment = true;
+    //   if (body.commandDateAffect) record.dateGovernment = body.commandDateAffect;
+    // }
 
     record.isEdit = true;
     record.lastUpdateUserId = req.user.sub;