ยกเลิกลา

2025-04-03 16:49:40 +07:00 · 2025-04-03 16:49:40 +07:00 · 337bff8853
commit 337bff8853
parent 7716a6fd02
2 changed files with 6 additions and 4 deletions
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@ -1152,7 +1152,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                }
                updated.IsCancel = true;
            }
-            else
+            else if (updated.Status == "REPORT")
            {
                using (var client = new HttpClient())
                {
@ -1691,7 +1691,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                  mouthSalaryAmount = r.mouthSalaryAmount,
                                  positionType = p.PositionTypeOld,
                                  positionLevel = p.PositionLevelOld,
-                                  isLeave = true,
+                                  isLeave = p.IsCancel == true ? false : true,
                                  leaveReason = "ออกจากราชการ",
                                  dateLeave = r.commandDateAffect,
                                  commandId = r.commandId,