Merge branch 'working' into develop

This commit is contained in:
Suphonchai Phoonsawat 2025-05-19 10:32:56 +07:00
commit 51b849f882
5 changed files with 42 additions and 3 deletions

View file

@ -498,7 +498,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
{
var rawData = _dbContext.Set<LeaveRequest>().AsNoTracking()
.Include(x => x.Type)
.Where(x => x.LeaveStatus == "DELETE")
.Where(x => x.LeaveStatus == "DELETE" || x.LeaveStatus == "DELETING")
.AsQueryable();
if (year != 0)