From e757ba1ec98a2bf5275586c90ff0c10f9ee50e63 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 28 Aug 2020 10:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/User.php            | 3 ++-
 app/admin/module/change/2020.08.28.01.md | 1 +
 app/admin/module/module.json             | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 app/admin/module/change/2020.08.28.01.md

diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index dd812a592..8099a5445 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -42,8 +42,9 @@ class User extends Controller
     public function index()
     {
         $this->title = '系统用户管理';
-        $query = $this->_query($this->table)->like('username,phone,mail');
+        $query = $this->_query($this->table);
         $query->equal('status')->dateBetween('login_at,create_at');
+        $query->like('username,contact_phone#phone,contact_mail#mail');
         // 加载对应数据列表
         $this->type = input('type', 'all');
         if ($this->type === 'all') {
diff --git a/app/admin/module/change/2020.08.28.01.md b/app/admin/module/change/2020.08.28.01.md
new file mode 100644
index 000000000..ca9339de9
--- /dev/null
+++ b/app/admin/module/change/2020.08.28.01.md
@@ -0,0 +1 @@
+* 修正系统用户搜索规则
\ No newline at end of file
diff --git a/app/admin/module/module.json b/app/admin/module/module.json
index 5183e81a4..3b56a9c29 100644
--- a/app/admin/module/module.json
+++ b/app/admin/module/module.json
@@ -1,6 +1,6 @@
 {
   "name": "admin",
   "author": "Anyon",
-  "version": "2020.08.03.01",
+  "version": "2020.08.28.01",
   "content": "ThinkAdmin 系统基础模块"
 }
\ No newline at end of file