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 1m50s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-02-20 16:33:33 +07:00
commit 5b054f9948
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,6 +140,7 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> GetExamByPlacement(Guid examId) public async Task<ActionResult<ResponseObject>> GetExamByPlacement(Guid examId)
{ {
var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(examId.ToString(), "SYS_PLACEMENT_PASS"); var getWorkflow = await _permission.GetPermissionAPIWorkflowAsync(examId.ToString(), "SYS_PLACEMENT_PASS");
var role = string.Empty;
if (getWorkflow == false) if (getWorkflow == false)
{ {
var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_PLACEMENT_PASS"); var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_PLACEMENT_PASS");
@ -148,6 +149,7 @@ namespace BMA.EHR.Placement.Service.Controllers
{ {
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
} }
role = jsonData["result"]?.ToString();
} }
var rootId = ""; var rootId = "";
@ -167,7 +169,7 @@ namespace BMA.EHR.Placement.Service.Controllers
if (_res.IsSuccessStatusCode) if (_res.IsSuccessStatusCode)
{ {
var org = JsonConvert.DeserializeObject<OrgRequestAct>(_result); var org = JsonConvert.DeserializeObject<OrgRequestAct>(_result);
if (org.result.isOfficer == false) if (org.result.isOfficer == false && role?.Trim().ToUpper() != "OWNER")
{ {
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;
@ -302,7 +304,7 @@ namespace BMA.EHR.Placement.Service.Controllers
} }
return Success(result1); return Success(result1);
} }
if (org.result.isOfficer == true) if (org.result.isOfficer == true || role?.Trim().ToUpper() == "OWNER")
{ {
var data = await _context.PlacementProfiles.Where(x => x.Placement.Id == examId).Select(x => new var data = await _context.PlacementProfiles.Where(x => x.Placement.Id == examId).Select(x => new
{ {
@ -690,6 +692,13 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> GetDashboardByPlacement(Guid examId) public async Task<ActionResult<ResponseObject>> GetDashboardByPlacement(Guid examId)
{ {
var role = string.Empty;
var getPermission = await _permission.GetPermissionAPIAsync("GET", "SYS_PLACEMENT_PASS");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() == "200")
{
role = jsonData["result"]?.ToString();
}
var rootId = ""; var rootId = "";
var child1Id = ""; var child1Id = "";
@ -709,7 +718,7 @@ namespace BMA.EHR.Placement.Service.Controllers
if (_res.IsSuccessStatusCode) if (_res.IsSuccessStatusCode)
{ {
var org = JsonConvert.DeserializeObject<OrgRequestAct>(_result); var org = JsonConvert.DeserializeObject<OrgRequestAct>(_result);
if (org.result.isOfficer == false) if (org.result.isOfficer == false && role?.Trim().ToUpper() != "OWNER")
{ {
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;
@ -733,7 +742,7 @@ namespace BMA.EHR.Placement.Service.Controllers
return Success(placement); return Success(placement);
} }
if (org.result.isOfficer == true) if (org.result.isOfficer == true || role?.Trim().ToUpper() == "OWNER")
{ {
var placement = await _context.Placements var placement = await _context.Placements
.Where(x => x.Id == examId) .Where(x => x.Id == examId)