|
|
|
|
@ -91,6 +91,14 @@ class BaseController extends CommonController
|
|
|
|
|
if ($op == 'notlike') {
|
|
|
|
|
$query->where($key, 'not like', '%' . $value . '%');
|
|
|
|
|
}
|
|
|
|
|
// null搜索
|
|
|
|
|
if ($op == 'null') {
|
|
|
|
|
$query->whereNull($key);
|
|
|
|
|
}
|
|
|
|
|
// notnull搜索
|
|
|
|
|
if ($op == 'notnull') {
|
|
|
|
|
$query->whereNotNull($key);
|
|
|
|
|
}
|
|
|
|
|
// 范围搜索
|
|
|
|
|
if ($op == 'range') {
|
|
|
|
|
list($from, $to) = explode(',', $value);
|
|
|
|
|
@ -243,7 +251,7 @@ class BaseController extends CommonController
|
|
|
|
|
public function excelShow()
|
|
|
|
|
{
|
|
|
|
|
$file = \request()->file('file');
|
|
|
|
|
$data = \request('data',[]);
|
|
|
|
|
$data = \request('data', []);
|
|
|
|
|
//判断文件是否有效
|
|
|
|
|
if (!(\request()->hasFile('file') && $file->isValid())) {
|
|
|
|
|
return $this->fail([ResponseCode::ERROR_BUSINESS, '文件不存在或无效']);
|
|
|
|
|
|