diff --git a/catch/user/model/UserSearch.php b/catch/user/model/UserSearch.php index 517aae5..9c73938 100644 --- a/catch/user/model/UserSearch.php +++ b/catch/user/model/UserSearch.php @@ -10,11 +10,11 @@ trait UserSearch public function searchEmailAttr($query, $value, $data) { - return $query->whereLike($this->aliasField('email'), $value); + return $query->whereLike('email', $value); } public function searchStatusAttr($query, $value, $data) { - return $query->where($this->aliasField('status'), $value); + return $query->where($this->aliasField('status'), $value); } } diff --git a/catch/user/model/Users.php b/catch/user/model/Users.php index 9dd814c..e0f9a28 100644 --- a/catch/user/model/Users.php +++ b/catch/user/model/Users.php @@ -5,7 +5,6 @@ use catchAdmin\permissions\model\Department; use catchAdmin\permissions\model\HasJobsTrait; use catchAdmin\permissions\model\HasRolesTrait; use catcher\base\CatchModel; -use catcher\Utils; class Users extends CatchModel { @@ -53,9 +52,8 @@ class Users extends CatchModel */ public function getList($search): \think\Paginator { - return (($search['trash'] ?? false) ? static::onlyTrashed() : $this) - ->withoutField(['updated_at'], true) - ->catchSearch() + return $this->withoutField(['updated_at'], true) + ->catchSearch() ->catchLeftJoin(Department::class, 'id', 'department_id', ['department_name']) ->order('users.id', 'desc') ->paginate($search['limit'] ?? $this->limit);