Merge branch 'master' of http://47.112.106.152:10880/tangyuanwang/zhijiayun

app/Http/Controllers/Manager/Collect/Product.php

@@ -62,7 +62,7 @@ class Product extends Controller
                 $result['data'][$key]['platform'] = isset($value['platform']) ? explode(',', $value['platform']) : '';
                 $product_specs = isset($value['product_specs']) ?  explode(',', $value['product_specs']) : '';
                 //移除空数组
-                $result['data'][$key]['product_specs'] = array_filter($product_specs);
+                $result['data'][$key]['product_specs'] = $product_specs ? array_filter($product_specs):'';
             }
         }
         // 加载模板
@@ -96,7 +96,7 @@ class Product extends Controller
         $data->platform = isset($data->platform) ? explode(',', $data->platform) : '';
         $product_specs = isset($data->product_specs) ?  explode(',', $data->product_specs) : '';
         //移除空数组
-        $data->product_specs = array_filter($product_specs);
+        $data->product_specs = $product_specs ? array_filter($product_specs):'';
         // 加载模板
         return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
     }

app/Models/Manager/Collect/Product.php

@@ -61,15 +61,15 @@ class Product extends Model
         DB::beginTransaction();
         try {
             // 计算品规数量
-            $product_specs_data = explode(',', $data['product_specs']);
+            $product_specs_data =isset($data['product_specs']) && $data['product_specs'] !='' ? explode(',', $data['product_specs']) : '';
             //移除数组内空值
-            $product_specs_data = array_filter($product_specs_data);
+            $product_specs_data = !empty($product_specs_data) ? array_filter($product_specs_data):'';
             $insert_data = [
                 'enable_full_quantity' => $data['enable_full_quantity'],
                 'platform' => $data['platform'],
                 'product_name' => $data['product_name'],
                 'product_specs' => $data['product_specs'],
-                'product_specs_number' => count($product_specs_data),
+                'product_specs_number' => $data['product_specs'] ? count($product_specs_data) : 1,
                 'minimum_order_quantity' => $data['minimum_order_quantity'],
                 'sampling_cycle' => $data['sampling_cycle'],
                 'sampling_start_time' => $data['sampling_start_time'],
@@ -102,15 +102,15 @@ class Product extends Model
         DB::beginTransaction();
         try {
             // 计算品规数量
-            $product_specs_data = explode(',', $data['product_specs']);
+             $product_specs_data =isset($data['product_specs']) && $data['product_specs'] !='' ? explode(',', $data['product_specs']) : '';
             //移除数组内空值
-            $product_specs_data = array_filter($product_specs_data);
+           $product_specs_data = !empty($product_specs_data) ? array_filter($product_specs_data):'';
 
             $Product->enable_full_quantity = $data['enable_full_quantity'];
             $Product->platform = $data['platform'];
             $Product->product_name = $data['product_name'];
             $Product->product_specs = $data['product_specs'];
-            $Product->product_specs_number = count($product_specs_data);
+            $Product->product_specs_number = $product_specs_data ? count($product_specs_data) : 1;
             $Product->minimum_order_quantity = $data['minimum_order_quantity'];
             $Product->sampling_cycle = $data['sampling_cycle'];
             $Product->sampling_start_time = $data['sampling_start_time'];