diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php
index 418b0b1..9e3e527 100644
--- a/app/Http/Controllers/ProductController.php
+++ b/app/Http/Controllers/ProductController.php
@@ -39,7 +39,7 @@ class ProductController extends Controller
         $sortDirection = $request->input('sort_direction', 'desc');
         
         // Define allowed sort fields to prevent SQL injection
-        $allowedSorts = ['id', 'code', 'name', 'category_id', 'base_unit', 'conversion_rate'];
+        $allowedSorts = ['id', 'code', 'name', 'category_id', 'base_unit_id', 'conversion_rate'];
         if (!in_array($sortField, $allowedSorts)) {
             $sortField = 'id';
         }
@@ -62,7 +62,6 @@ class ProductController extends Controller
         $categories = \App\Models\Category::where('is_active', true)->get();
 
         return Inertia::render('Product/Index', [
-            'products' => $products,
             'products' => $products,
             'categories' => $categories,
             'units' => Unit::all(),
diff --git a/resources/js/Components/Product/ProductTable.tsx b/resources/js/Components/Product/ProductTable.tsx
index e4a3da7..cac8e54 100644
--- a/resources/js/Components/Product/ProductTable.tsx
+++ b/resources/js/Components/Product/ProductTable.tsx
@@ -89,7 +89,11 @@ export default function ProductTable({
                   分類 <SortIcon field="category_id" />
                 </button>
               </TableHead>
-              <TableHead>基本單位</TableHead>
+              <TableHead>
+                <button onClick={() => onSort("base_unit_id")} className="flex items-center hover:text-gray-900 font-semibold">
+                  基本單位 <SortIcon field="base_unit_id" />
+                </button>
+              </TableHead>
               <TableHead>換算率</TableHead>
               <TableHead className="text-center">操作</TableHead>
             </TableRow>
@@ -121,11 +125,11 @@ export default function ProductTable({
                       {product.category?.name || '-'}
                     </Badge>
                   </TableCell>
-                  <TableCell>{product.baseUnit?.name || '-'}</TableCell>
+                  <TableCell>{product.base_unit?.name || '-'}</TableCell>
                   <TableCell>
-                    {product.largeUnit ? (
+                    {product.large_unit ? (
                       <span className="text-sm text-gray-500">
-                        1 {product.largeUnit?.name} = {Number(product.conversion_rate)} {product.baseUnit?.name}
+                        1 {product.large_unit?.name} = {Number(product.conversion_rate)} {product.base_unit?.name}
                       </span>
                     ) : (
                       '-'
diff --git a/resources/js/Pages/Product/Index.tsx b/resources/js/Pages/Product/Index.tsx
index b7e73f6..55b89a0 100644
--- a/resources/js/Pages/Product/Index.tsx
+++ b/resources/js/Pages/Product/Index.tsx
@@ -33,12 +33,12 @@ export interface Product {
   brand?: string;
   specification?: string;
   base_unit_id: number;
-  baseUnit?: Unit;
+  base_unit?: Unit;
   large_unit_id?: number;
-  largeUnit?: Unit;
+  large_unit?: Unit;
   conversion_rate?: number;
   purchase_unit_id?: number;
-  purchaseUnit?: Unit;
+  purchase_unit?: Unit;
   created_at: string;
   updated_at: string;
 }