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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

Browse source
This commit is contained in:
kittapath 2024-10-22 14:56:35 +07:00
commit 57e8d68d96
8 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -759,6 +759,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = false,
leaveReason = _null,
dateLeave = _null,
isGovernment = true,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -911,6 +912,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = false,
leaveReason = _null,
dateLeave = _null,
isGovernment = true
}).ToList();
var baseAPIOrg = _configuration["API"];

1
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -547,6 +547,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = true,
leaveReason = "ให้ออกจากราชการ",
dateLeave = r.commandAffectDate,
isGovernment = false
}).ToList();
var baseAPIOrg = _configuration["API"];

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

@ -1885,6 +1885,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = true,
leaveReason = "ลาออกจากราชการ",
dateLeave = r.commandAffectDate,
isGovernment = false
}).ToList();
var baseAPIOrg = _configuration["API"];