From 257c29391ea4fb83c3ead9748a02f040275b4eaf Mon Sep 17 00:00:00 2001
From: wuyanwen <wuyanwen@baijiayun.com>
Date: Sun, 19 Jan 2020 15:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/user/model/UserSearch.php | 4 ++--
 catch/user/model/Users.php      | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

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);