feat: 實作使用者管理與公共事業費分頁標準化

app/Http/Controllers/Admin/UserController.php

@@ -20,9 +20,27 @@ class UserController extends Controller
         $perPage = $request->input('per_page', 10);
         $sortBy = $request->input('sort_by', 'id');
         $sortOrder = $request->input('sort_order', 'asc');
+        $search = $request->input('search');
+        $roleId = $request->input('role');
 
         $query = User::with(['roles:id,name,display_name']);
 
+        // Handle Search
+        if ($search) {
+            $query->where(function ($q) use ($search) {
+                $q->where('name', 'like', "%{$search}%")
+                  ->orWhere('email', 'like', "%{$search}%")
+                  ->orWhere('username', 'like', "%{$search}%");
+            });
+        }
+
+        // Handle Role Filter
+        if ($roleId && $roleId !== 'all') {
+            $query->whereHas('roles', function ($q) use ($roleId) {
+                $q->where('id', $roleId);
+            });
+        }
+
          // Handle sorting
         if (in_array($sortBy, ['name', 'created_at'])) {
            $query->orderBy($sortBy, $sortOrder);
@@ -31,10 +49,12 @@ class UserController extends Controller
         }
 
         $users = $query->paginate($perPage)->withQueryString();
+        $roles = Role::select('id', 'name', 'display_name')->get();
 
         return Inertia::render('Admin/User/Index', [
             'users' => $users,
-            'filters' => $request->only(['per_page', 'sort_by', 'sort_order']),
+            'roles' => $roles,
+            'filters' => $request->only(['per_page', 'sort_by', 'sort_order', 'search', 'role']),
         ]);
     }
 

app/Http/Controllers/UtilityFeeController.php

@@ -45,14 +45,14 @@ class UtilityFeeController extends Controller
              $query->orderBy('created_at', 'desc');
         }
 
-        $fees = $query->paginate($request->input('per_page', 15))->withQueryString();
+        $fees = $query->paginate($request->input('per_page', 10))->withQueryString();
 
         $availableCategories = UtilityFee::distinct()->pluck('category');
 
         return Inertia::render('UtilityFee/Index', [
             'fees' => $fees,
             'availableCategories' => $availableCategories,
-            'filters' => $request->only(['search', 'category', 'date_start', 'date_end', 'sort_field', 'sort_direction']),
+            'filters' => $request->only(['search', 'category', 'date_start', 'date_end', 'sort_field', 'sort_direction', 'per_page']),
         ]);
     }