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

fix sort /api/v1/leave/admin/edit (#1848)

Browse source
This commit is contained in:
AdisakKanthawilang 2025-10-08 11:01:57 +07:00 • committed by GitHub
parent 0dcabaa25d
commit f784205412
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2560,6 +2560,10 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
result = result.Where(x => x.FullName.Contains(keyword)).ToList(); result = result.Where(x => x.FullName.Contains(keyword)).ToList();
} }
if (string.IsNullOrWhiteSpace(sortBy))
{
sortBy = "default";
}
if (!string.IsNullOrWhiteSpace(sortBy)) if (!string.IsNullOrWhiteSpace(sortBy))
{ {
switch (sortBy.ToUpper()) switch (sortBy.ToUpper())
@ -2606,11 +2610,12 @@ namespace BMA.EHR.Leave.Service.Controllers
else else
result = result.OrderBy(x => x.Description).ToList(); result = result.OrderBy(x => x.Description).ToList();
break; break;
default: break; default:
result = result.OrderBy(x => x.StatusSort).ToList();
break;
} }
} }
var pageResult = result.Skip((page - 1) * pageSize).Take(pageSize) var pageResult = result.Skip((page - 1) * pageSize).Take(pageSize)
.OrderBy(x => x.StatusSort)
.ToList(); .ToList();
return Success(new { data = pageResult, total = result.Count }); return Success(new { data = pageResult, total = result.Count });