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

no message

Browse source
This commit is contained in:
kittapath 2024-12-24 13:34:54 +07:00
parent 0b760a253f
commit 7630cb4277
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -161,10 +161,10 @@ namespace BMA.EHR.Placement.Service.Controllers
if (org.result.isOfficer == false) if (org.result.isOfficer == false)
{ {
rootId = org.result.rootId == null ? "" : org.result.rootId; rootId = org.result.rootId == null ? "" : org.result.rootId;
child1Id = org.result.child1Id == null ? "" : org.result.child1Id; // child1Id = org.result.child1Id == null ? "" : org.result.child1Id;
child2Id = org.result.child2Id == null ? "" : org.result.child2Id; // child2Id = org.result.child2Id == null ? "" : org.result.child2Id;
child3Id = org.result.child3Id == null ? "" : org.result.child3Id; // child3Id = org.result.child3Id == null ? "" : org.result.child3Id;
child4Id = org.result.child4Id == null ? "" : org.result.child4Id; // child4Id = org.result.child4Id == null ? "" : org.result.child4Id;
var data1 = await _context.PlacementProfiles var data1 = await _context.PlacementProfiles
.Where(x => x.Placement.Id == examId) .Where(x => x.Placement.Id == examId)
.Where(x => x.Draft == true) .Where(x => x.Draft == true)
@ -633,10 +633,10 @@ namespace BMA.EHR.Placement.Service.Controllers
if (org.result.isOfficer == false) if (org.result.isOfficer == false)
{ {
rootId = org.result.rootId == null ? "" : org.result.rootId; rootId = org.result.rootId == null ? "" : org.result.rootId;
child1Id = org.result.child1Id == null ? "" : org.result.child1Id; // child1Id = org.result.child1Id == null ? "" : org.result.child1Id;
child2Id = org.result.child2Id == null ? "" : org.result.child2Id; // child2Id = org.result.child2Id == null ? "" : org.result.child2Id;
child3Id = org.result.child3Id == null ? "" : org.result.child3Id; // child3Id = org.result.child3Id == null ? "" : org.result.child3Id;
child4Id = org.result.child4Id == null ? "" : org.result.child4Id; // child4Id = org.result.child4Id == null ? "" : org.result.child4Id;
var placement = await _context.Placements var placement = await _context.Placements
.Where(x => x.Id == examId) .Where(x => x.Id == examId)
.Select(x => new .Select(x => new

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

@ -82,7 +82,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
var child2Id = ""; var child2Id = "";
var child3Id = ""; var child3Id = "";
var child4Id = ""; var child4Id = "";
var apiUrl = $"{_configuration["API"]}/org/profile/keycloak/position"; var apiUrl = $"{_configuration["API"]}/org/permission/checkOrg/{UserId}";
using (var client = new HttpClient()) using (var client = new HttpClient())
{ {
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));