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 1m12s
Details
Build & Deploy Checkin Service / build (push) Successful in 1m13s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-01-20 11:20:16 +07:00
commit d7b257f0ce
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -699,6 +699,7 @@ namespace BMA.EHR.Placement.Service.Controllers
Organization = req.Organization, Organization = req.Organization,
Reason = req.Reason, Reason = req.Reason,
Status = "APPROVE", Status = "APPROVE",
Date = req.Date,
CreatedFullName = FullName ?? "System Administrator", CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "", CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now, CreatedAt = DateTime.Now,

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

@ -290,7 +290,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), _system); var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(id.ToString(), _system);
if (getWorkflow == false) if (getWorkflow == false)
{ {
var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_DISMISS"); var getPermission = await _permission.GetPermissionAPIAsync("GET", _system);
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission); var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200") if (jsonData["status"]?.ToString() != "200")
{ {