From 0dba5c68a048b94e820951de300d58d44fca666f Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Thu, 10 Sep 2020 10:40:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E7=BC=96=E8=BE=91=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/GoodsActivityController.php | 9 +++++----
 app/Admin/Controllers/v3/GoodsController.php         | 8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php
index af66991..37b9b0b 100644
--- a/app/Admin/Controllers/v3/GoodsActivityController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityController.php
@@ -191,10 +191,11 @@ class GoodsActivityController extends AdminController
                     });
                 $form->saving(function (Form $form){
                     $storeId = $form->input('store_id');
-                    
-                    // 商品所属市场，根据店铺查询市场
-                    $info = StoreModel::getStoreInfo($storeId,'market_id');
-                    $form->market_id = $info->market_id;
+                    if(!empty($storeId)){
+                        // 商品所属市场，根据店铺查询市场
+                        $info = StoreModel::getStoreInfo($storeId,'market_id');
+                        $form->market_id = $info->market_id;
+                    }
                 });
                 $form->disableResetButton();
                 $form->disableViewCheck();
diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index acecc4d..34a9869 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -216,9 +216,11 @@ class GoodsController extends AdminController
             $form->saving(function (Form $form){
                 $storeId = $form->input('store_id');
                
-                // 商品所属市场，根据店铺查询市场
-                $info = StoreModel::getStoreInfo($storeId,'market_id');
-                $form->market_id = $info->market_id;
+                if(!empty($storeId)){
+                    // 商品所属市场，根据店铺查询市场
+                    $info = StoreModel::getStoreInfo($storeId,'market_id');
+                    $form->market_id = $info->market_id;
+                }
             });
         });
     }