From 985d4c8b592afa4e58b2d75688701391d2a30af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=BB=BA=E7=82=8A?= <924182103@qq.com>
Date: Mon, 4 Nov 2024 11:31:56 +0800
Subject: [PATCH] =?UTF-8?q?a=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Goods/GoodsCombinationController.php | 2 +-
 app/Http/Controllers/Goods/GoodsSkusController.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Goods/GoodsCombinationController.php b/app/Http/Controllers/Goods/GoodsCombinationController.php
index 31308d6..cb87da7 100644
--- a/app/Http/Controllers/Goods/GoodsCombinationController.php
+++ b/app/Http/Controllers/Goods/GoodsCombinationController.php
@@ -92,7 +92,7 @@ class GoodsCombinationController extends Controller
             }
             $finalIds = array_merge($finalIds, array_keys($goodsSkus));
             $idField = implode(',', $finalIds);
-            $goodsSkusBuilder->orderByRaw("FIELD(id, {$idField})");
+            $goodsSkusBuilder->orderByRaw("FIELD({$idField},id) {$sortValue}");
         } else {
             $goodsSkusBuilder->orderBy($sortField, $sortValue);
         }
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index 28737db..7b8b31d 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -104,7 +104,7 @@ class GoodsSkusController extends Controller
 
         $sortField = $request->input('sort_field', 'id');//stock sale_stock  order_goods_num
         $sortValue = $request->input('sort_value', 'desc');
-        $goodsSkusBuilder = (clone $builder)->with(['goods' => function ($query) {
+        $goodsSkusBuilder = (clone $builder)->filter()->with(['goods' => function ($query) {
             $query->with(['type' => function ($query) {
                 $query->with("parentType:id,name")->select(["id", "name", "parent_id"]);
             }]);
@@ -128,7 +128,7 @@ class GoodsSkusController extends Controller
             }
             $finalIds = array_merge($finalIds, array_keys($goodsSkus));
             $idField = implode(',', $finalIds);
-            $goodsSkusBuilder->orderByRaw("FIELD(id, {$idField})");
+            $goodsSkusBuilder->orderByRaw("FIELD({$idField},id) {$sortValue}");
         } else {
             $goodsSkusBuilder->orderBy($sortField, $sortValue);
         }