Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -135,7 +135,9 @@ class ProductLogic extends  BaseLogic
         }
         }
         $param['attrs'] = Arr::a2s($param['attrs'] ?? '');
         $param['attrs'] = Arr::a2s($param['attrs'] ?? '');
         $param['attr_id'] = Arr::arrToSet($param['attr_id'] ?? '');
         $param['attr_id'] = Arr::arrToSet($param['attr_id'] ?? '');
-        $param['category_id'] = $this->getLastCategory($param['category_id']);
+        if(isset($param['category_id']) && !empty($param['category_id'])) {
+            $param['category_id'] = $this->getLastCategory($param['category_id']);
+        }
         if(isset($param['keyword_id']) && !empty($param['keyword_id'])){
         if(isset($param['keyword_id']) && !empty($param['keyword_id'])){
             $param['keyword_id'] = ','.Arr::arrToSet($param['keyword_id']).',';
             $param['keyword_id'] = ','.Arr::arrToSet($param['keyword_id']).',';
         }
         }