เก็บประวัติ
This commit is contained in:
parent
a1c8874925
commit
16622b4768
4 changed files with 28 additions and 12 deletions
|
|
@ -3676,7 +3676,7 @@ export class PositionController extends Controller {
|
|||
await new permission().PermissionDelete(request, "SYS_ORG");
|
||||
const dataMaster = await this.posMasterRepository.findOne({
|
||||
where: { id: id },
|
||||
relations: ["positions"],
|
||||
relations: ["positions", "orgRevision"],
|
||||
});
|
||||
if (!dataMaster) {
|
||||
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลตำแหน่งนี้");
|
||||
|
|
@ -3697,6 +3697,9 @@ export class PositionController extends Controller {
|
|||
positionIsSelected: false,
|
||||
});
|
||||
});
|
||||
if (dataMaster.orgRevision.orgRevisionIsCurrent) {
|
||||
await CreatePosMasterHistoryOfficer(dataMaster.id, request);
|
||||
}
|
||||
// //เช็คถ้า revision ปัจจุบันให้ปั๊มที่ profile
|
||||
// const chkRevision = await this.orgRevisionRepository.findOne({
|
||||
// where: { id: dataMaster.orgRevisionId },
|
||||
|
|
@ -4924,7 +4927,6 @@ export class PositionController extends Controller {
|
|||
await CreatePosMasterHistoryOfficer(posMasterOld.id, request);
|
||||
}
|
||||
await this.posMasterRepository.save(posMaster);
|
||||
await CreatePosMasterHistoryOfficer(posMaster.id, request);
|
||||
|
||||
const positionNew = await this.positionRepository.findOne({
|
||||
where: {
|
||||
|
|
@ -4940,6 +4942,8 @@ export class PositionController extends Controller {
|
|||
await this.profileRepository.save(profile);
|
||||
await this.positionRepository.save(positionNew);
|
||||
}
|
||||
await CreatePosMasterHistoryOfficer(posMaster.id, request);
|
||||
|
||||
return new HttpSuccess();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue