Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop
This commit is contained in:
commit
c3901d56b3
2 changed files with 7 additions and 1 deletions
|
|
@ -574,6 +574,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
LastUpdatedAt = DateTime.Now,
|
||||
};
|
||||
var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position";
|
||||
bool isDeputy = false;
|
||||
using (var client = new HttpClient())
|
||||
{
|
||||
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
|
||||
|
|
@ -587,6 +588,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
if (org == null || org.result == null)
|
||||
return Error("ไม่พบหน่วยงานของผู้ใช้งานคนนี้", 404);
|
||||
|
||||
isDeputy = org.result.isDeputy.HasValue ? org.result.isDeputy.Value : false;
|
||||
|
||||
placementTransfer.profileId = org.result.profileId;
|
||||
placementTransfer.prefix = org.result.prefix;
|
||||
placementTransfer.firstName = org.result.firstName;
|
||||
|
|
@ -663,6 +666,7 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
var baseAPIOrg = _configuration["API"];
|
||||
var apiUrlOrg = $"{baseAPIOrg}/org/workflow/add-workflow";
|
||||
using (var client = new HttpClient())
|
||||
|
|
@ -675,7 +679,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
sysName = "SYS_TRANSFER_REQ",
|
||||
posLevelName = placementTransfer.posLevelNameOld,
|
||||
posTypeName = placementTransfer.posTypeNameOld,
|
||||
fullName = $"{placementTransfer.prefix}{placementTransfer.firstName} {placementTransfer.lastName}"
|
||||
fullName = $"{placementTransfer.prefix}{placementTransfer.firstName} {placementTransfer.lastName}",
|
||||
isDeputy = isDeputy
|
||||
});
|
||||
}
|
||||
await _context.SaveChangesAsync();
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ namespace BMA.EHR.Placement.Service.Requests
|
|||
public string? education { get; set; }
|
||||
public double? Amount { get; set; }
|
||||
public string? avatarUrl { get; set; }
|
||||
public bool? isDeputy { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue