From d0c46daa3cd210f8d88567638fe7a2203f43fdaf Mon Sep 17 00:00:00 2001
From: liveup <kingf_c@foxmail.com>
Date: Mon, 22 Aug 2022 12:15:54 +0000
Subject: [PATCH] =?UTF-8?q?update=20app/AdminController.php.=20=E5=8E=9F?=
 =?UTF-8?q?=E6=9C=89$this->admin['id']=EF=BC=8C=E4=BD=BF=E7=94=A8request()?=
 =?UTF-8?q?->adminInfo['id']=E6=9B=BF=E4=BB=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: liveup <kingf_c@foxmail.com>
---
 app/AdminController.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/AdminController.php b/app/AdminController.php
index 5fc1a777..415068de 100644
--- a/app/AdminController.php
+++ b/app/AdminController.php
@@ -69,7 +69,8 @@ class AdminController extends BaseController
      * 管理员信息
      * @var array
      */
-    public $admin = [];
+    //public $admin = [];使用以下替代
+    //request()->adminInfo['id']
 
     /**
      * 获取模板
@@ -181,7 +182,7 @@ class AdminController extends BaseController
 
             $post = $this->preRuleOutFields(\request()->post());
             if ($this->dataLimit) {
-                $post[$this->dataLimitField] = $this->admin['id'];
+                $post[$this->dataLimitField] = request()->adminInfo['id'];
             }
 
             $validate = $this->isValidate ? get_class($this->model) : $this->isValidate;
@@ -209,7 +210,7 @@ class AdminController extends BaseController
         // 限制数据调用
         if (!$this->auth->SuperAdmin() && $this->dataLimit
             && in_array($this->dataLimitField, $this->model->getFields())) {
-            if ($data[$this->dataLimitField] != $this->admin['id']) {
+            if ($data[$this->dataLimitField] != request()->adminInfo['id']) {
                 return $this->error('没有权限');
             }
         }
@@ -250,7 +251,7 @@ class AdminController extends BaseController
             foreach ($list as $item) {
                 if (!$this->auth->SuperAdmin() && $this->dataLimit
                     && in_array($this->dataLimitField, $this->model->getFields())) {
-                    if ($item[$this->dataLimitField] != $this->admin['id']) {
+                    if ($item[$this->dataLimitField] != request()->adminInfo['id']) {
                         continue;
                     }
                 }
@@ -280,7 +281,7 @@ class AdminController extends BaseController
             $where[] = ['id', '=', input('id')];
             if (!$this->auth->SuperAdmin() && $this->dataLimit
                 && in_array($this->dataLimitField, $this->model->getFields())) {
-                $where[] = [$this->dataLimitField, '=', $this->admin['id']];
+                $where[] = [$this->dataLimitField, '=',request()->adminInfo['id']];
             }
 
             try {
@@ -507,7 +508,7 @@ class AdminController extends BaseController
             // 限制数据字段
             if (!$this->auth->SuperAdmin() && $this->dataLimit) {
                 if (in_array($this->dataLimitField, $this->tableFields)) {
-                    $where[] = [$this->dataLimitField, '=', $this->admin['id']];
+                    $where[] = [$this->dataLimitField, '=', request()->adminInfo['id']];
                 }
             }
 
-- 
Gitee