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

fix : leave

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-07-11 12:15:17 +07:00
parent dfa87f98bb
commit 2ae1b13440
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1091,13 +1091,13 @@ namespace BMA.EHR.Leave.Service.Controllers
var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(item.KeycloakUserId, AccessToken); var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(item.KeycloakUserId, AccessToken);
// Get Organization // Get Organization
var org = await _userProfileRepository.GetOrganizationById(profile.OcId ?? Guid.Empty); //var org = await _userProfileRepository.GetOrganizationById(profile.OcId ?? Guid.Empty);
var agency_id = org == null ? Guid.Empty : org.OrganizationAgencyId ?? Guid.Empty; //var agency_id = org == null ? Guid.Empty : org.OrganizationAgencyId ?? Guid.Empty;
var gov_agency_id = org == null ? Guid.Empty : org.OrganizationGovernmentAgencyId ?? Guid.Empty; //var gov_agency_id = org == null ? Guid.Empty : org.OrganizationGovernmentAgencyId ?? Guid.Empty;
var agency = await _userProfileRepository.GetOrgAgencyById(agency_id); //var agency = await _userProfileRepository.GetOrgAgencyById(agency_id);
var gov_agency = await _userProfileRepository.GetOrgGovAgencyById(gov_agency_id); //var gov_agency = await _userProfileRepository.GetOrgGovAgencyById(gov_agency_id);
var res = new GetLeaveRequestForAdminResultDto var res = new GetLeaveRequestForAdminResultDto
@ -1113,8 +1113,8 @@ namespace BMA.EHR.Leave.Service.Controllers
LeaveEndDate = item.LeaveEndDate, LeaveEndDate = item.LeaveEndDate,
Position = profile.Position == null ? "" : profile.Position, Position = profile.Position == null ? "" : profile.Position,
Level = profile.PosLevel == null ? "" : profile.PosLevel.PosLevelName, Level = profile.PosLevel == null ? "" : profile.PosLevel.PosLevelName,
Agency = agency == null ? "" : agency.Name, Agency = "-", //agency == null ? "" : agency.Name,
Org = gov_agency == null ? "" : gov_agency.Name, Org = "-", //gov_agency == null ? "" : gov_agency.Name,
LeaveRange = item.LeaveRange ?? "ALL" LeaveRange = item.LeaveRange ?? "ALL"
}; };
result.Add(res); result.Add(res);