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

Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
moss 2025-05-07 17:14:07 +07:00
commit e452bd9255
3 changed files with 139 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
View file

@ -1299,7 +1299,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
.Include(x => x.Type)
//.Where(x => x.LeaveStartDate.Year == year)
.Where(x => x.LeaveStartDate.Date >= startFiscalDate && x.LeaveStartDate.Date <= endFiscalDate) // fix issue : #729
.Where(x => x.LeaveStatus == "DELETE")
.Where(x => x.LeaveStatus == "DELETE" && x.LeaveCancelStatus == "APPROVE")
.ToListAsync();
var res = (from d in data