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

app/Http/Controllers/Manager/Process/LowPriceGoods.php

@@ -1044,9 +1044,9 @@ class LowPriceGoods extends Controller
                     }
                 }
 
-                if (!isset($province_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => '']);
+                if (!isset($province_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => $item]);
                 $city_name = $item[16];
-                if (!isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => '']);
+                if (!isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => $item]);
                 // 权限判断
                 if ($is_admin != 1 && $company_id != 0) {
                     $insert_product_data['company_id'] = $company_id;

app/Http/Controllers/Manager/Process/ViolationProduct.php

@@ -848,9 +848,9 @@ class ViolationProduct extends Controller
                         $province_name = $province_name . '省';
                     }
                 }
-                if (!isset($province_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => '']);
+                if (!isset($province_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => $item]);
                 $city_name = $item[14];
-                if (!isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => '']);
+                if (!isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => $item]);
                 // 权限判断
                 if ($is_admin != 1 && $company_id != 0) {
                     $insert_product_data['company_id'] = $company_id;