รายชื่อผู้สอบผ่าน กรณี OWNER ให้เห็นรายชื่อเหมือน สกจ. #2319
This commit is contained in:
parent
7e613ab2e6
commit
c425edaa3e
1 changed files with 4 additions and 2 deletions
|
|
@ -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
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue