From 3e0717c339f7987f61fc28a239184215a1c5937e Mon Sep 17 00:00:00 2001
From: wuyanwen <wuyanwen@baijiayun.com>
Date: Mon, 13 Jan 2020 21:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=90=9C=E7=B4=A2=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/user/model/UserSearch.php | 19 +++++++++++++++++++
 catch/user/model/Users.php      | 24 ++++++++++--------------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/catch/user/model/UserSearch.php b/catch/user/model/UserSearch.php
index b3d9bbc..517aae5 100644
--- a/catch/user/model/UserSearch.php
+++ b/catch/user/model/UserSearch.php
@@ -1 +1,20 @@
 <?php
+namespace catchAdmin\user\model;
+
+trait UserSearch
+{
+    public function searchUsernameAttr($query, $value, $data)
+    {
+        return $query->whereLike('username', $value);
+    }
+
+    public function searchEmailAttr($query, $value, $data)
+    {
+        return $query->whereLike($this->aliasField('email'), $value);
+    }
+
+    public function searchStatusAttr($query, $value, $data)
+    {
+      return $query->where($this->aliasField('status'), $value);
+    }
+}
diff --git a/catch/user/model/Users.php b/catch/user/model/Users.php
index d9909f8..9dd814c 100644
--- a/catch/user/model/Users.php
+++ b/catch/user/model/Users.php
@@ -1,15 +1,18 @@
 <?php
 namespace catchAdmin\user\model;
 
+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
 {
     use HasRolesTrait;
     use HasJobsTrait;
-
+    use UserSearch;
+    
     protected $name = 'users';
 
     protected $field = [
@@ -17,8 +20,8 @@ class Users extends CatchModel
 			'username', // 用户名
 			'password', // 用户密码
 			'email', // 邮箱 登录
-            'creator_id', // 创建者ID
-            'department_id', // 部门ID
+      'creator_id', // 创建者ID
+      'department_id', // 部门ID
 			'status', // 用户状态 1 正常 2 禁用
 			'last_login_ip', // 最后登录IP
 			'last_login_time', // 最后登录时间
@@ -51,17 +54,10 @@ class Users extends CatchModel
     public function getList($search): \think\Paginator
     {
         return (($search['trash'] ?? false) ? static::onlyTrashed() : $this)
-                    ->field(['id', 'username', 'email', 'status','last_login_time','last_login_ip', 'department_id','created_at', 'updated_at'])
-                    ->when($search['username'] ?? false, function ($query) use ($search){
-                        $query->whereLike('username', '%' . $search['username'] . '%');
-                    })
-                    ->when($search['email'] ?? false, function ($query) use ($search){
-                        $query->whereLike('email', '%' . $search['email'] . '%');
-                    })
-                    ->when($search['status'] ?? false, function ($query) use ($search){
-                        $query->where('status', $search['status']);
-                    })
-                    ->order('id', 'desc')
+                    ->withoutField(['updated_at'], true)
+                    ->catchSearch() 
+                    ->catchLeftJoin(Department::class, 'id', 'department_id', ['department_name'])
+                    ->order('users.id', 'desc')
                     ->paginate($search['limit'] ?? $this->limit);
     }