diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 6bb55426..9af96752 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -3435,9 +3435,10 @@ export class CommandController extends Controller { profile.leaveRemark = clearProfile.leaveRemark ?? _null; profile.leaveDate = item.commandDateAffect ?? _null; profile.leaveType = clearProfile.LeaveType ?? _null; - profile.position = _null; - profile.posTypeId = _null; - profile.posLevelId = _null; + //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516) + // profile.position = _null; + // profile.posTypeId = _null; + // profile.posLevelId = _null; } if (item.isGovernment == true) { const returnWork = await checkReturnCommandType(String(item.commandId)); @@ -3657,9 +3658,10 @@ export class CommandController extends Controller { profile.leaveRemark = clearProfile.leaveRemark ?? _null; profile.leaveDate = item.commandDateAffect ?? _null; profile.leaveType = clearProfile.LeaveType ?? _null; - profile.position = _null; - profile.posTypeId = _null; - profile.posLevelId = _null; + //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516) + // profile.position = _null; + // profile.posTypeId = _null; + // profile.posLevelId = _null; } await this.profileEmployeeRepository.save(profile); }), @@ -3798,9 +3800,10 @@ export class CommandController extends Controller { profile.leaveRemark = clearProfile.leaveRemark ?? _null; profile.leaveDate = item.commandDateAffect ?? _null; profile.leaveType = clearProfile.LeaveType ?? _null; - profile.position = _null; - profile.posTypeId = _null; - profile.posLevelId = _null; + //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516) + // profile.position = _null; + // profile.posTypeId = _null; + // profile.posLevelId = _null; profile.leaveReason = item.leaveReason ?? _null; profile.dateLeave = item.dateLeave ?? _null; profile.amount = item.amount ?? _null; @@ -4251,9 +4254,10 @@ export class CommandController extends Controller { _profile.leaveRemark = clearProfile.leaveRemark ?? _null; _profile.leaveDate = item.commandDateAffect ?? _null; _profile.leaveType = clearProfile.LeaveType ?? _null; - _profile.position = _null; - _profile.posTypeId = _null; - _profile.posLevelId = _null; + //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516) + // _profile.position = _null; + // _profile.posTypeId = _null; + // _profile.posLevelId = _null; } await this.profileRepository.save(_profile); } @@ -4449,9 +4453,10 @@ export class CommandController extends Controller { _profile.leaveRemark = clearProfile.leaveRemark ?? _null; _profile.leaveDate = item.commandDateAffect ?? _null; _profile.leaveType = clearProfile.LeaveType ?? _null; - _profile.position = _null; - _profile.posTypeId = _null; - _profile.posLevelId = _null; + //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516) + // _profile.position = _null; + // _profile.posTypeId = _null; + // _profile.posLevelId = _null; } await this.profileEmployeeRepository.save(_profile); } @@ -4733,9 +4738,10 @@ export class CommandController extends Controller { _profile.leaveRemark = clearProfile.leaveRemark ?? _null; _profile.leaveDate = item.commandDateAffect ?? _null; _profile.leaveType = clearProfile.LeaveType ?? _null; - _profile.position = _null; - _profile.posTypeId = _null; - _profile.posLevelId = _null; + //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516) + // _profile.position = _null; + // _profile.posTypeId = _null; + // _profile.posLevelId = _null; } await this.profileEmployeeRepository.save(_profile); } @@ -5162,9 +5168,10 @@ export class CommandController extends Controller { _profile.leaveRemark = clearProfile.leaveRemark ?? _null; _profile.leaveDate = item.commandDateAffect ?? _null; _profile.leaveType = clearProfile.LeaveType ?? _null; - _profile.position = _null; - _profile.posTypeId = _null; - _profile.posLevelId = _null; + //ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน (issue #1516) + // _profile.position = _null; + // _profile.posTypeId = _null; + // _profile.posLevelId = _null; } await Promise.all([ this.profileRepository.save(_profile),