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

fix #26, #1832

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-10-02 19:50:55 +07:00
parent faf62f1985
commit 1e275748a0
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BMA.EHR.Leave/Controllers/LeaveController.cs
View file

@ -1232,7 +1232,9 @@ namespace BMA.EHR.Leave.Service.Controllers
if (keyword != "")
{
data = data.Where(x => (x.CheckInLocation.Contains(keyword) || x.CheckOutLocation.Contains(keyword))).ToList();
data = data.Where(x => (x.CheckInLocationName!.Contains(keyword) || x.CheckInLocation!.Contains(keyword) ||
x.CheckOutLocationName!.Contains(keyword) || x.CheckOutLocation!.Contains(keyword)))
.ToList();
}
var pageData = data
@ -2731,7 +2733,7 @@ namespace BMA.EHR.Leave.Service.Controllers
if (keyword != "")
{
result = result.Where(x => x.EditReason!.Contains(keyword)).ToList();
result = result.Where(x => x.EditReason!.Contains(keyword) || x.CheckInLocation!.Contains(keyword) || x.CheckOutLocation!.Contains(keyword)).ToList();
}
var pageResult = result.Skip((page - 1) * pageSize).Take(pageSize)