From d2610a444a6409990db45ccbbd46b7c9a053892c Mon Sep 17 00:00:00 2001 From: augushong Date: Mon, 8 Aug 2022 15:13:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EsearchOp=E7=9A=84none?= =?UTF-8?q?=E7=94=A8=E6=B3=95=EF=BC=8C=E4=BC=A0=E5=85=A5none=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=BC=9A=E5=8E=9F=E5=B0=81=E4=B8=8D=E5=8A=A8?= =?UTF-8?q?=E7=9A=84=E5=B0=86=E5=8F=82=E6=95=B0=E8=BF=94=E5=9B=9E=E5=88=B0?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/controller/AdminController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/common/controller/AdminController.php b/app/common/controller/AdminController.php index 649b5ae..b40008f 100644 --- a/app/common/controller/AdminController.php +++ b/app/common/controller/AdminController.php @@ -217,6 +217,8 @@ class AdminController extends BaseController $where = []; $excludes = []; + $request_options = []; + // 判断是否关联查询 $tableName = \think\helper\Str::snake(lcfirst($this->model->getName())); @@ -268,11 +270,14 @@ class AdminController extends BaseController $where[] = [$key, '>=', strtotime($beginTime)]; $where[] = [$key, '<=', strtotime($endTime)]; break; + case 'none': + $request_options[$key] = $val; + break; default: $where[] = [$key, $op, "%{$val}"]; } } - return [$page, $limit, $where, $excludes]; + return [$page, $limit, $where, $excludes, $request_options]; } /**