From 2ae1b1344003e7636d5996b3b578ff65f88d886c Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 11 Jul 2024 12:15:17 +0700 Subject: [PATCH] fix : leave --- .../Controllers/LeaveRequestController.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 5adf66ca..a93e3b66 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1091,13 +1091,13 @@ namespace BMA.EHR.Leave.Service.Controllers var profile = await _userProfileRepository.GetProfileByKeycloakIdAsync(item.KeycloakUserId, AccessToken); // 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 gov_agency_id = org == null ? Guid.Empty : org.OrganizationGovernmentAgencyId ?? 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 agency = await _userProfileRepository.GetOrgAgencyById(agency_id); - var gov_agency = await _userProfileRepository.GetOrgGovAgencyById(gov_agency_id); + //var agency = await _userProfileRepository.GetOrgAgencyById(agency_id); + //var gov_agency = await _userProfileRepository.GetOrgGovAgencyById(gov_agency_id); var res = new GetLeaveRequestForAdminResultDto @@ -1113,8 +1113,8 @@ namespace BMA.EHR.Leave.Service.Controllers LeaveEndDate = item.LeaveEndDate, Position = profile.Position == null ? "" : profile.Position, Level = profile.PosLevel == null ? "" : profile.PosLevel.PosLevelName, - Agency = agency == null ? "" : agency.Name, - Org = gov_agency == null ? "" : gov_agency.Name, + Agency = "-", //agency == null ? "" : agency.Name, + Org = "-", //gov_agency == null ? "" : gov_agency.Name, LeaveRange = item.LeaveRange ?? "ALL" }; result.Add(res);