From b4b43ceff288794399527aaee7a21fb73e3756ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 10 Sep 2021 16:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Oplog.php |  7 -------
 app/admin/controller/User.php  | 16 ++++++----------
 app/admin/model/SystemUser.php | 12 ++++++++++++
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/admin/controller/Oplog.php b/app/admin/controller/Oplog.php
index 94e45b93e..42ad13a74 100644
--- a/app/admin/controller/Oplog.php
+++ b/app/admin/controller/Oplog.php
@@ -33,13 +33,6 @@ use think\exception\HttpResponseException;
  */
 class Oplog extends Controller
 {
-
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    private $table = 'SystemOplog';
-
     /**
      * 系统日志管理
      * @auth true
diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index 3bb9faab6..9f489f6a7 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -25,6 +25,7 @@ use think\admin\service\AdminService;
 use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
 use think\db\exception\ModelNotFoundException;
+use think\model\Relation;
 
 /**
  * 系统用户管理
@@ -44,7 +45,11 @@ class User extends Controller
     public function index()
     {
         $this->type = input('get.type', 'index');
-        $this->_query(SystemUser::class)->layTable(function () {
+        $this->_query(SystemUser::mk()->with([
+            'userinfo' => function (Relation $relation) {
+                $relation->field('code,name,content');
+            },
+        ]))->layTable(function () {
             $this->title = '系统用户管理';
             $this->bases = SystemBase::mk()->items('身份权限');
         }, function (QueryHelper $query) {
@@ -60,15 +65,6 @@ class User extends Controller
         });
     }
 
-    /**
-     * 数据列表处理
-     * @param array $data
-     */
-    protected function _page_filter(array &$data)
-    {
-        SystemBase::mk()->items('身份权限', $data, 'usertype', 'userinfo');
-    }
-
     /**
      * 添加系统用户
      * @auth true
diff --git a/app/admin/model/SystemUser.php b/app/admin/model/SystemUser.php
index 274398c45..bbcbb3612 100644
--- a/app/admin/model/SystemUser.php
+++ b/app/admin/model/SystemUser.php
@@ -17,6 +17,7 @@
 namespace app\admin\model;
 
 use think\admin\Model;
+use think\model\relation\HasOne;
 
 /**
  * 系统用户模型
@@ -58,6 +59,17 @@ class SystemUser extends Model
         }
     }
 
+    /**
+     * 关联身份权限
+     * @return HasOne
+     */
+    public function userinfo(): HasOne
+    {
+        return $this->hasOne(SystemBase::class, 'code', 'usertype')->where([
+            'type' => '身份权限', 'status' => 1, 'deleted' => 0,
+        ]);
+    }
+
     /**
      * 格式化登录时间
      * @param string $value