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

revert #1462
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
Bright 2025-05-02 17:36:16 +07:00
parent 4382e779d7
commit ae3d5dab70
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
BMA.EHR.Leave/Controllers/LeaveRequestController.cs
View file

@ -1554,27 +1554,27 @@ namespace BMA.EHR.Leave.Service.Controllers
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
// เพิ่มเติมการดึงคนตามสิทธิ์แบบที่ bright ทำ #1462
var profileList = new List<GetProfileByKeycloakIdRootDto>();
if (req.ProfileType.Trim().ToUpper() == "OFFICER")
{
//// เพิ่มเติมการดึงคนตามสิทธิ์แบบที่ bright ทำ #1462
//var profileList = new List<GetProfileByKeycloakIdRootDto>();
//if (req.ProfileType.Trim().ToUpper() == "OFFICER")
//{
profileList = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllOfficerAndRevision(AccessToken, req.Node, req.NodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.RevisionId);
}
else
{
// profileList = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllOfficerAndRevision(AccessToken, req.Node, req.NodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.RevisionId);
//}
//else
//{
profileList = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllEmployeeAndRevision(AccessToken, req.Node, req.NodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.RevisionId);
}
// profileList = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllEmployeeAndRevision(AccessToken, req.Node, req.NodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.RevisionId);
//}
var keycloakList = new List<Guid>();
if(profileList != null)
{
keycloakList = profileList.Where(x => x.Keycloak != null).Select(x => x.Keycloak!.Value).ToList();
}
var rawData = await _leaveRequestRepository.GetLeaveRequestForAdminWithAuthAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate, keycloakList);
//var keycloakList = new List<Guid>();
//if(profileList != null)
//{
// keycloakList = profileList.Where(x => x.Keycloak != null).Select(x => x.Keycloak!.Value).ToList();
//}
//var rawData = await _leaveRequestRepository.GetLeaveRequestForAdminWithAuthAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate, keycloakList);
var rawData = await _leaveRequestRepository.GetLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate);
var result = new List<GetLeaveRequestForAdminResultDto>();
foreach (var item in rawData)

4
BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminDto.cs
View file

@ -28,9 +28,9 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public string ProfileType { get; set; } = string.Empty;
public string NodeId { get; set; } = string.Empty;
public string? NodeId { get; set; } = string.Empty;
public int Node { get; set; }
public int? Node { get; set; }
public string? RevisionId { get; set; } = string.Empty;