|
|
@@ -62,7 +62,6 @@ class Company extends Controller
|
|
|
$request->scene('all')->validate();
|
|
|
// 查询条件
|
|
|
$map = [];
|
|
|
- $status = request('status', '');
|
|
|
$start_time = request('start_time', '');
|
|
|
$end_time = request('end_time', '');
|
|
|
$company_name = request('company_name', '');
|
|
|
@@ -70,7 +69,7 @@ class Company extends Controller
|
|
|
if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
|
|
|
if ($end_time) $map[] = ['insert_time', '<=', strtotime($end_time)];
|
|
|
// 其他条件
|
|
|
- if (is_numeric($status)) $map[] = ['status', '=', $status];
|
|
|
+ $map[] = ['status', '=', 0];
|
|
|
if ($company_name) $map[] = ['company_name', 'like', "%$company_name%"];
|
|
|
// 查询数据
|
|
|
$result = $CompanyModel->query()
|
