From 69030f1fbc05931ebc4795af28a427a218a4121a Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Fri, 27 Dec 2024 11:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E4=B8=93?=
 =?UTF-8?q?=E5=8C=BA=E5=95=86=E5=93=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/ActivityZoneFormLogic.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin/logic/ActivityZoneFormLogic.php b/app/admin/logic/ActivityZoneFormLogic.php
index c8854679b..f24cb03ff 100644
--- a/app/admin/logic/ActivityZoneFormLogic.php
+++ b/app/admin/logic/ActivityZoneFormLogic.php
@@ -126,7 +126,7 @@ class ActivityZoneFormLogic extends BaseLogic
         $service = new ActivityZoneService();
         $activityZoneForm = ActivityZoneForm::findOrEmpty($params['id'])->toArray();
         $productIds = ActivityZone::where('form_id', $params['id'])->column('product_id');
-        $products = StoreProduct::field('id,unit,store_name,two_cate_id')->whereIn('id', $productIds)->order('two_cate_id')->select()->toArray();
+        $products = StoreProduct::field('id,unit,store_name,two_cate_id')->whereIn('id', $productIds)->order('two_cate_id asc,cate_id asc')->select()->toArray();
         $unitIds = array_unique(array_column($products, 'unit'));
         $cateIds = array_unique(array_column($products, 'two_cate_id'));
         $unit = StoreProductUnit::whereIn('id', $unitIds)->field('id,name')->withTrashed()->select()->toArray();