hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop' into working
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m39s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-04-03 12:09:32 +07:00
commit cea1c4b64e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -165,7 +165,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.ApproveReason,
p.RejectReason,
p.CancelReason,
p.Status,
status = p.RetirementResignCancels.FirstOrDefault() == null ? p.Status : p.RetirementResignCancels.FirstOrDefault().Status,
statusCancel = p.RetirementResignCancels.FirstOrDefault() == null ? null : p.RetirementResignCancels.FirstOrDefault().Status,
p.IsActive,
})

4
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -102,8 +102,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.Remark,
p.ApproveReason,
p.RejectReason,
p.CancelReason,
p.Status,
p.CancelReason,
status = p.RetirementResignEmployeeCancels.FirstOrDefault() == null ? p.Status : p.RetirementResignEmployeeCancels.FirstOrDefault().Status,
statusCancel = p.RetirementResignEmployeeCancels.FirstOrDefault() == null ? null : p.RetirementResignEmployeeCancels.FirstOrDefault().Status,
p.IsActive,
})