From f784205412c346167d75b589accd8e2fba3520ca Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang
 <153157069+AdisakKanthawilang@users.noreply.github.com>
Date: Wed, 8 Oct 2025 11:01:57 +0700
Subject: [PATCH] fix sort /api/v1/leave/admin/edit (#1848)

---
 BMA.EHR.Leave/Controllers/LeaveController.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 });