From 938ccae7010cd558f5dac416619d7469ffb9ab34 Mon Sep 17 00:00:00 2001
From: Ying <coolsec@foxmail.com>
Date: Mon, 22 Aug 2022 23:04:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AdminController.php | 10 +++++-----
 config/route.php        |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/AdminController.php b/app/AdminController.php
index 5fc1a77..f923353 100644
--- a/app/AdminController.php
+++ b/app/AdminController.php
@@ -181,7 +181,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 +209,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 +250,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 +280,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 +507,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']];
                 }
             }
 
diff --git a/config/route.php b/config/route.php
index 5fccd24..c44dab8 100644
--- a/config/route.php
+++ b/config/route.php
@@ -21,7 +21,8 @@ if ($defineRoute && is_array($defineRoute)) {
 }
 
 Route::any('/manage', function () {
-    request()->session()->set(AdminSession, ['_security' => request()->buildToken()]);
+    // 登录入口session缓存
+    request()->session()->set('AdminLogin', ['_security' => request()->buildToken()]);
     return redirect('/admin/login');
 });