|
|
@@ -43,6 +43,7 @@ class ViolationProduct extends Controller
|
|
|
$responsible_person = request('responsible_person', '');
|
|
|
$platform = request('platform', '');
|
|
|
$company_name = request('company_name', '');
|
|
|
+ $company_names = request('company_names', '');
|
|
|
$store_name = request('store_name', '');
|
|
|
$store_names = request('store_names', '');
|
|
|
$source_responsible_person = request('source_responsible_person', '');
|
|
|
@@ -57,6 +58,7 @@ class ViolationProduct extends Controller
|
|
|
if ($product_name) $map[] = ['product_name', 'like', "%$product_name%"];
|
|
|
if ($store_name) $map[] = ['store_name', 'like', "%$store_name%"];
|
|
|
if ($category_name) $map[] = ['category_name', 'like', "%$category_name%"];
|
|
|
+ if ($company_name) $map[] = ['company_name', 'like', "%$company_name%"];
|
|
|
|
|
|
//多选平台查询
|
|
|
if ($platform && is_string($platform)) {
|
|
|
@@ -94,9 +96,9 @@ class ViolationProduct extends Controller
|
|
|
$ViolationProductModel = $ViolationProductModel->whereIn('product_name', $product_names);
|
|
|
}
|
|
|
//多选公司查询
|
|
|
- if ($company_name && is_string($company_name)) {
|
|
|
- $company_name = explode(',', $company_name);
|
|
|
- $ViolationProductModel = $ViolationProductModel->whereIn('company_name', $company_name);
|
|
|
+ if ($company_names && is_string($company_names)) {
|
|
|
+ $company_names = explode(',', $company_names);
|
|
|
+ $ViolationProductModel = $ViolationProductModel->whereIn('company_name', $company_names);
|
|
|
}
|
|
|
//多选第一责任人
|
|
|
if ($first_responsible_person && is_string($first_responsible_person)) {
|