เก็บประวัติ

src/controllers/EmployeePositionController.ts

@@ -39,8 +39,8 @@ import { RequestWithUser } from "../middlewares/user";
 import permission from "../interfaces/permission";
 import { setLogDataDiff } from "../interfaces/utils";
 import {
-  CreatePosMasterHistoryOfficer,
   CreatePosMasterHistoryEmployee,
+  CreatePosMasterHistoryOfficer,
 } from "../services/PositionService";
 import { PosMasterEmployeeHistory } from "../entities/PosMasterEmployeeHistory";
 @Route("api/v1/org/employee/pos")
@@ -2288,7 +2288,7 @@ export class EmployeePositionController extends Controller {
     await new permission().PermissionDelete(request, "SYS_ORG_EMP");
     const dataMaster = await this.employeePosMasterRepository.findOne({
       where: { id: id },
-      relations: ["positions"],
+      relations: ["positions", "orgRevision"],
     });
     if (!dataMaster) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตำแหน่งนี้");
@@ -2321,7 +2321,9 @@ export class EmployeePositionController extends Controller {
         positionIsSelected: false,
       });
     });
-
+    if (dataMaster.orgRevision.orgRevisionIsCurrent) {
+      await CreatePosMasterHistoryEmployee(dataMaster.id, request);
+    }
     return new HttpSuccess();
   }
 
@@ -2451,7 +2453,6 @@ export class EmployeePositionController extends Controller {
       await CreatePosMasterHistoryEmployee(posMasterOld.id, request);
     }
     await this.employeePosMasterRepository.save(posMaster);
-    await CreatePosMasterHistoryEmployee(posMaster.id, request);
 
     const positionNew = await this.employeePositionRepository.findOne({
       where: {
@@ -2472,6 +2473,7 @@ export class EmployeePositionController extends Controller {
       await this.profileRepository.save(profile);
       await this.employeePositionRepository.save(positionNew);
     }
+    await CreatePosMasterHistoryEmployee(posMaster.id, request);
     return new HttpSuccess();
   }