|
|
@@ -48,6 +48,7 @@ class ViolationProduct extends Controller
|
|
|
$store_scope = request('store_scope', '');
|
|
|
$company_scope = request('company_scope', '');
|
|
|
$category_id = request('category_id', '');
|
|
|
+ $product_brand = request('product_brand', '');
|
|
|
// 时间条件
|
|
|
if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
|
|
|
if ($end_time) $map[] = ['insert_time', '<=', strtotime($end_time)];
|
|
|
@@ -57,6 +58,7 @@ class ViolationProduct extends Controller
|
|
|
if ($store_scope) $map[] = ['store_scope', '=', $store_scope];
|
|
|
if ($company_scope) $map[] = ['company_scope', '=', $company_scope];
|
|
|
if ($category_id) $map[] = ['category_id', '=', $category_id];
|
|
|
+ if ($product_brand) $map[] = ['product_brand', 'like', "%$product_brand%"];
|
|
|
// 查询数据
|
|
|
if ($is_admin != 1 && $company_id != 0) {
|
|
|
$map[] = ['company_id', '=', $company_id];
|