|
|
@@ -91,6 +91,7 @@ class Product extends Controller
|
|
|
$start_time = request('start_time', '');
|
|
|
$end_time = request('end_time', '');
|
|
|
$product_name = request('product_name', '');
|
|
|
+ $product_brand = request('product_brand', '');
|
|
|
$platform = request('platform', '');
|
|
|
// 时间条件
|
|
|
if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
|
|
|
@@ -99,6 +100,7 @@ class Product extends Controller
|
|
|
$map[] = ['status', '=', 0];
|
|
|
if ($product_name) $map[] = ['product_name', 'like', "%$product_name%"];
|
|
|
if (is_numeric($platform) || $platform) $map[] = ['platform', 'like', "%$platform%"];
|
|
|
+ if ($product_brand) $map[] = ['product_brand', 'like', "%$product_brand%"];
|
|
|
// 权限判断
|
|
|
if ($is_admin != 1 && $company_id != 0) {
|
|
|
$map[] = ['company_id', '=', $company_id];
|