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