diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs index 1c714867..a1b97c1d 100644 --- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs @@ -106,18 +106,20 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests public async Task> GetLeaveRequestForAdminAsync(int year, Guid type, string status) { - var rawData = _dbContext.Set().AsQueryable() - .Include(x => x.Type); + var rawData = _dbContext.Set() + .Include(x => x.Type) + .AsQueryable(); + if (year != 0) - rawData = (IIncludableQueryable)rawData.Where(x => x.LeaveStartDate.Year == year); + rawData = rawData.Where(x => x.LeaveStartDate.Year == year); if (type != Guid.Empty) - rawData = (IIncludableQueryable)rawData.Where(x => x.Type.Id == type); + rawData = rawData.Where(x => x.Type.Id == type); if (status.Trim().ToUpper() != "ALL") - rawData = (IIncludableQueryable)rawData.Where(x => x.LeaveStatus == status); + rawData = rawData.Where(x => x.LeaveStatus == status); return await rawData.ToListAsync(); }