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();