0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改用户搜索错误

Browse Source
This commit is contained in:
wuyanwen 2020-01-19 15:50:15 +08:00
parent 92d4092f1c
commit 257c29391e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
catch/user/model/UserSearch.php
View File

@ -10,7 +10,7 @@ trait UserSearch
public function searchEmailAttr($query, $value, $data) public function searchEmailAttr($query, $value, $data)
{ {
return $query->whereLike($this->aliasField('email'), $value); return $query->whereLike('email', $value);
} }
public function searchStatusAttr($query, $value, $data) public function searchStatusAttr($query, $value, $data)

4
catch/user/model/Users.php
View File

@ -5,7 +5,6 @@ use catchAdmin\permissions\model\Department;
use catchAdmin\permissions\model\HasJobsTrait; use catchAdmin\permissions\model\HasJobsTrait;
use catchAdmin\permissions\model\HasRolesTrait; use catchAdmin\permissions\model\HasRolesTrait;
use catcher\base\CatchModel; use catcher\base\CatchModel;
use catcher\Utils;
class Users extends CatchModel class Users extends CatchModel
{ {
@ -53,8 +52,7 @@ class Users extends CatchModel
*/ */
public function getList($search): \think\Paginator public function getList($search): \think\Paginator
{ {
return (($search['trash'] ?? false) ? static::onlyTrashed() : $this) return $this->withoutField(['updated_at'], true)
->withoutField(['updated_at'], true)
->catchSearch() ->catchSearch()
->catchLeftJoin(Department::class, 'id', 'department_id', ['department_name']) ->catchLeftJoin(Department::class, 'id', 'department_id', ['department_name'])
->order('users.id', 'desc') ->order('users.id', 'desc')