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

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-06-23 20:44:16 +07:00
commit 298b61fc67
2 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -188,6 +188,7 @@ namespace BMA.EHR.Placement.Service.Controllers
p.posLevelOldId, p.posLevelOldId,
p.posLevelNameOld, p.posLevelNameOld,
p.CreatedAt, p.CreatedAt,
p.CreatedUserId,
p.profileId, p.profileId,
p.rootDnaId, p.rootDnaId,
p.child1DnaId, p.child1DnaId,
@ -206,17 +207,17 @@ namespace BMA.EHR.Placement.Service.Controllers
if (role == "OWNER" || role == "CHILD") if (role == "OWNER" || role == "CHILD")
{ {
placementReceives = placementReceives placementReceives = placementReceives
.Where(x => node == 4 ? x.child4DnaId == nodeId : (node == 3 ? x.child3DnaId == nodeId : (node == 2 ? x.child2DnaId == nodeId : (node == 1 ? x.child1DnaId == nodeId : (node == 0 ? x.rootDnaId == nodeId : (node == null ? true : true)))))).ToList(); .Where(x => (node == 4 ? x.child4DnaId == nodeId : (node == 3 ? x.child3DnaId == nodeId : (node == 2 ? x.child2DnaId == nodeId : (node == 1 ? x.child1DnaId == nodeId : (node == 0 ? x.rootDnaId == nodeId : (node == null ? true : true)))))) || (x.CreatedUserId == UserId)).ToList();
} }
else if (role == "ROOT") else if (role == "ROOT")
{ {
placementReceives = placementReceives placementReceives = placementReceives
.Where(x => x.rootDnaId == nodeId).ToList(); .Where(x => (x.rootDnaId == nodeId) || (x.CreatedUserId == UserId)).ToList();
} }
else if (role == "NORMAL") else if (role == "NORMAL")
{ {
placementReceives = placementReceives placementReceives = placementReceives
.Where(x => node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))).ToList(); .Where(x => (node == 0 ? x.child1DnaId == null : (node == 1 ? x.child2DnaId == null : (node == 2 ? x.child3DnaId == null : (node == 3 ? x.child4DnaId == null : true)))) || (x.CreatedUserId == UserId)).ToList();
} }
return Success(placementReceives); return Success(placementReceives);
} }

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

@ -77,13 +77,27 @@ namespace BMA.EHR.Retirement.Service.Controllers
[HttpGet("{type}")] [HttpGet("{type}")]
public async Task<ActionResult<ResponseObject>> GetListByAdmin(string type, string? status = "WAITTING") public async Task<ActionResult<ResponseObject>> GetListByAdmin(string type, string? status = "WAITTING")
{ {
var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISMISS"); string role = "";
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission); if (type.Trim().ToUpper() == "OFFICER")
if (jsonData["status"]?.ToString() != "200")
{ {
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISMISS");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200")
{
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
role = jsonData["result"]?.ToString();
}
else
{
var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISMISS_EMP");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200")
{
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
role = jsonData["result"]?.ToString();
} }
string role = jsonData["result"]?.ToString();
var nodeId = string.Empty; var nodeId = string.Empty;
var profileAdmin = new GetUserOCAllDto(); var profileAdmin = new GetUserOCAllDto();
profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken); profileAdmin = await _userProfileRepository.GetUserOCAll(Guid.Parse(UserId!), AccessToken);
@ -366,18 +380,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOut.citizenId = org.result.citizenId; retirementOut.citizenId = org.result.citizenId;
retirementOut.rootOld = org.result.root; retirementOut.rootOld = org.result.root;
retirementOut.rootOldId = org.result.rootId; retirementOut.rootOldId = org.result.rootId;
retirementOut.rootDnaOldId = org.result.rootDnaId;
retirementOut.rootShortNameOld = org.result.rootShortName; retirementOut.rootShortNameOld = org.result.rootShortName;
retirementOut.child1Old = org.result.child1; retirementOut.child1Old = org.result.child1;
retirementOut.child1OldId = org.result.child1Id; retirementOut.child1OldId = org.result.child1Id;
retirementOut.child1DnaOldId = org.result.child1DnaId;
retirementOut.child1ShortNameOld = org.result.child1ShortName; retirementOut.child1ShortNameOld = org.result.child1ShortName;
retirementOut.child2Old = org.result.child2; retirementOut.child2Old = org.result.child2;
retirementOut.child2OldId = org.result.child2Id; retirementOut.child2OldId = org.result.child2Id;
retirementOut.child2DnaOldId = org.result.child2DnaId;
retirementOut.child2ShortNameOld = org.result.child2ShortName; retirementOut.child2ShortNameOld = org.result.child2ShortName;
retirementOut.child3Old = org.result.child3; retirementOut.child3Old = org.result.child3;
retirementOut.child3OldId = org.result.child3Id; retirementOut.child3OldId = org.result.child3Id;
retirementOut.child3DnaOldId = org.result.child3DnaId;
retirementOut.child3ShortNameOld = org.result.child3ShortName; retirementOut.child3ShortNameOld = org.result.child3ShortName;
retirementOut.child4Old = org.result.child4; retirementOut.child4Old = org.result.child4;
retirementOut.child4OldId = org.result.child4Id; retirementOut.child4OldId = org.result.child4Id;
retirementOut.child4DnaOldId = org.result.child4DnaId;
retirementOut.child4ShortNameOld = org.result.child4ShortName; retirementOut.child4ShortNameOld = org.result.child4ShortName;
retirementOut.posMasterNoOld = org.result.posMasterNo; retirementOut.posMasterNoOld = org.result.posMasterNo;
retirementOut.posTypeOldId = org.result.posTypeId; retirementOut.posTypeOldId = org.result.posTypeId;