|
|
@@ -218,7 +218,7 @@ class LowPriceGoods extends Controller
|
|
|
* @version 1.0
|
|
|
* @date 2025-06-17
|
|
|
*/
|
|
|
- public function export_excel(Request $request, LowPriceGoodsModel $LowPriceGoodsModel,LowPriceGoodsMemberModel $LowPriceGoodsMemberModel)
|
|
|
+ public function export_excel(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, LowPriceGoodsMemberModel $LowPriceGoodsMemberModel)
|
|
|
{
|
|
|
$request->scene('export_excel')->validate();
|
|
|
$message_data['admin_company_id'] = request('admin_company_id', '0');
|
|
|
@@ -292,11 +292,10 @@ class LowPriceGoods extends Controller
|
|
|
if ($category_name) $map[] = ['category_name', 'like', "%$category_name%"];
|
|
|
|
|
|
|
|
|
- $admin_company_id = $message_data['admin_company_id'] ?? '0';
|
|
|
- $company_id = $message_data['access_token']['company_id'] ?? '0';
|
|
|
- $is_admin = $message_data['access_token']['is_admin'] ?? '0'; //是否管理员操作 0=是1=否
|
|
|
- $is_admin = $message_data['access_token']['is_admin'] ?? '0'; //是否管理员操作 0=是1=否
|
|
|
- $user_id = $message_data['access_token']['uid'] ?? 0;
|
|
|
+ $admin_company_id = $message_data['admin_company_id'];
|
|
|
+ $company_id = $message_data['company_id'];
|
|
|
+ $is_admin = $message_data['is_admin']; //是否管理员操作 0=是1=否
|
|
|
+ $user_id = $message_data['user_id'];
|
|
|
|
|
|
$low_price_goods_where = [];
|
|
|
// 权限判断
|
|
|
@@ -390,8 +389,8 @@ class LowPriceGoods extends Controller
|
|
|
$shipment_city_ids = explode(',', $shipment_city_ids);
|
|
|
$LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('shipment_city_id', $shipment_city_ids);
|
|
|
}
|
|
|
- $result_count = 0;
|
|
|
- if ($is_admin != 1 && $company_id != 0) {
|
|
|
+ $result_count = 0;
|
|
|
+ if ($is_admin != 1 && $company_id != 0) {
|
|
|
$result_count = $LowPriceGoodsModel->where(function ($q) use ($user_id) {
|
|
|
$q->where('first_responsible_person', 'like', "%,$user_id,%")
|
|
|
->orWhere('responsible_person', 'like', "%,$user_id,%")
|
|
|
@@ -403,6 +402,7 @@ class LowPriceGoods extends Controller
|
|
|
$result_count = $LowPriceGoodsModel->where($map)
|
|
|
->count();
|
|
|
}
|
|
|
+
|
|
|
if ($result_count == 0) return json_send(['code' => 'fail', 'msg' => '没有查询到数据', 'data' => '']);
|
|
|
if ($result_count > 150000) return json_send(['code' => 'fail', 'msg' => '导出数据超过15万条,请缩小导出范围后再试', 'data' => '']);
|
|
|
|
|
|
@@ -1068,17 +1068,17 @@ class LowPriceGoods extends Controller
|
|
|
$shipment_province_name = $shipment_province_name . '省';
|
|
|
}
|
|
|
}
|
|
|
- $shipment_province_id ='0';
|
|
|
- if (!isset($province_id_data[$shipment_province_name])){
|
|
|
+ $shipment_province_id = '0';
|
|
|
+ if (!isset($province_id_data[$shipment_province_name])) {
|
|
|
$shipment_province_name = '';
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
$shipment_province_id = $province_id_data[$shipment_province_name]['id'];
|
|
|
}
|
|
|
$shipment_city_id = '0';
|
|
|
$shipment_city_name = isset($item[23]) ? $item[23] : '';
|
|
|
- if (!isset($city_id_data[$shipment_city_name])){
|
|
|
+ if (!isset($city_id_data[$shipment_city_name])) {
|
|
|
$shipment_city_name = '';
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
$shipment_city_id = $city_id_data[$shipment_city_name]['id'];
|
|
|
}
|
|
|
|