From ea6a4b15a8c1fbe595c77de28df4627cdcc8f16b Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Tue, 26 May 2020 22:39:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/catcher/CatchQuery.php | 10 +++++++++- extend/catcher/command/worker/ExcelTaskCommand.php | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 extend/catcher/command/worker/ExcelTaskCommand.php diff --git a/extend/catcher/CatchQuery.php b/extend/catcher/CatchQuery.php index cad39d2..18150e9 100644 --- a/extend/catcher/CatchQuery.php +++ b/extend/catcher/CatchQuery.php @@ -3,6 +3,7 @@ namespace catcher; use catcher\base\CatchModel; use think\db\Query; +use think\helper\Str; use think\Paginator; class CatchQuery extends Query @@ -115,7 +116,14 @@ class CatchQuery extends Query return $this; } - return $this->withSearch(array_keys($params), Utils::filterSearchParams($params)); + foreach ($params as $field => $value) { + $method = 'search' . Str::studly($field) . 'Attr'; + if (method_exists($this->model, $method)) { + $this->model->$method($this, $value ?? null, $params); + } + } + + return $this; } /** diff --git a/extend/catcher/command/worker/ExcelTaskCommand.php b/extend/catcher/command/worker/ExcelTaskCommand.php new file mode 100644 index 0000000..b3d9bbc --- /dev/null +++ b/extend/catcher/command/worker/ExcelTaskCommand.php @@ -0,0 +1 @@ +