From ba6e641bacd3366bc9afea9db48543d18f1f7fd0 Mon Sep 17 00:00:00 2001
From: yiming <yiming@eztrust.com.tw>
Date: Wed, 12 Nov 2025 17:51:42 +0800
Subject: [PATCH] STAGE 2 OK

---
 web/App_Code/api/activity_kindController.cs | 2 +-
 web/App_Code/api/appellationController.cs   | 9 ++++++---
 web/App_Code/api/countryController.cs       | 9 ++++++---
 web/App_Code/api/member_titleController.cs  | 2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/web/App_Code/api/activity_kindController.cs b/web/App_Code/api/activity_kindController.cs
index 13694c2..bcbbecb 100644
--- a/web/App_Code/api/activity_kindController.cs
+++ b/web/App_Code/api/activity_kindController.cs
@@ -54,7 +54,7 @@ public class activity_kindController : ApiController
     public IHttpActionResult GetList([FromBody] Model.ViewModel.actItem_kind q,
     int page, int pageSize = 10, string sortBy = "", bool sortDesc = false)
     {
-        var qry = _db.actItem_kind.AsEnumerable();
+        var qry = _db.actItem_kind.AsQueryable();
         if (!string.IsNullOrEmpty(q.kind))
             qry = qry.Where(o => o.kind.Contains(q.kind));
         if (!string.IsNullOrEmpty(q.status))
diff --git a/web/App_Code/api/appellationController.cs b/web/App_Code/api/appellationController.cs
index 14727f4..18a1298 100644
--- a/web/App_Code/api/appellationController.cs
+++ b/web/App_Code/api/appellationController.cs
@@ -44,19 +44,22 @@ public class appellationController : BaseApiController
     public IHttpActionResult GetList([FromBody] Model.appellation q,
        int page, int pageSize = 10, string sortBy = "", bool sortDesc = false)
     {
-        var qry = _db.appellations.AsEnumerable();
+        var qry = _db.appellations.AsQueryable();
 
 
         qry = qry.OrderBy(o => o.num);
 
+        var count = qry.Count();
+        var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList();
+
         var ret = new
         {
-            list = qry.ToPagedList(page, pageSize).Select(x => new
+            list = qryList.Select(x => new
             {
                 num = x.num,
                 title = x.title,
             }),
-            count = qry.Count()
+            count = count
         };
 
 
diff --git a/web/App_Code/api/countryController.cs b/web/App_Code/api/countryController.cs
index 4300efa..f6b57bd 100644
--- a/web/App_Code/api/countryController.cs
+++ b/web/App_Code/api/countryController.cs
@@ -44,22 +44,25 @@ public class countryController : BaseApiController
     public IHttpActionResult GetList([FromBody] Model.ViewModel.country q,
        int page, int pageSize = 10, string sortBy = "", bool sortDesc = false)
     {
-        var qry = _db.countries.AsEnumerable();
+        var qry = _db.countries.AsQueryable();
 
         if (!string.IsNullOrEmpty(q.keyword))
             qry = qry.Where(o => o.ID.Contains(q.keyword.Trim()) || o.name_en.Contains(q.keyword.Trim()) || o.name_zh.Contains(q.keyword.Trim()));
       
         qry = qry.OrderBy(o => o.range).ThenBy(o => o.name_en);
 
+        var count = qry.Count();
+        var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList();
+
         var ret = new
         {
-            list = qry.ToPagedList(page, pageSize).Select(x => new
+            list = qryList.Select(x => new
             {
                 id = x.ID,
                 name_en = x.name_en,
                 name_zh = x.name_zh,
             }),
-            count = qry.Count()
+            count = count
         };
 
 
diff --git a/web/App_Code/api/member_titleController.cs b/web/App_Code/api/member_titleController.cs
index 99598aa..a5e34be 100644
--- a/web/App_Code/api/member_titleController.cs
+++ b/web/App_Code/api/member_titleController.cs
@@ -52,7 +52,7 @@ public class member_titleController : ApiController
     public IHttpActionResult GetList([FromBody] Model.ViewModel.member_title q,
 int page, int pageSize = 10, string sortBy = "", bool sortDesc = false)
     {
-        var qry = _db.member_title.AsEnumerable();
+        var qry = _db.member_title.AsQueryable();
         var ret = new { list = "", count = 0 };
         return Ok(ret);
     }