From 38201de23475c3a0ecaa9bd03d4821b78820cea8 Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Tue, 22 Apr 2025 09:32:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E5=99=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/controller/AdminControllerBase.php | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/extend/base/common/controller/AdminControllerBase.php b/extend/base/common/controller/AdminControllerBase.php
index cae686a..a8ddd68 100644
--- a/extend/base/common/controller/AdminControllerBase.php
+++ b/extend/base/common/controller/AdminControllerBase.php
@@ -6,7 +6,6 @@ use app\admin\model\SystemAdmin;
 use app\BaseController;
 use app\common\constants\AdminConstant;
 use app\common\service\AuthService;
-use think\facade\Cache;
 use think\facade\Config;
 use think\facade\Env;
 use think\facade\View;
@@ -303,19 +302,21 @@ class AdminControllerBase extends BaseController
                 $batch = $this->batchValidate;
             }
 
-            if ($this->validateRule instanceof Validate) {
-                $this->validateRule->message($message);
-
-                // 是否批量验证
-                if ($batch) {
-                    $this->validateRule->batch(true);
-                }
-
-                $this->validateRule->failException(true)->check($data);
-            } elseif (is_array($this->validateRule)) {
-                parent::validate($data, $this->validateRule, $message, $batch);
-            } else {
+            if (!empty($validate)) {
                 parent::validate($data, $validate, $message, $batch);
+            } elseif (!empty($this->validateRule)) {
+                if ($this->validateRule instanceof Validate) {
+                    $this->validateRule->message($message);
+
+                    // 是否批量验证
+                    if ($batch) {
+                        $this->validateRule->batch(true);
+                    }
+
+                    $this->validateRule->failException(true)->check($data);
+                } elseif (is_array($this->validateRule)) {
+                    parent::validate($data, $this->validateRule, $message, $batch);
+                }
             }
         } catch (\Exception $e) {
             $this->error($e->getMessage());
@@ -521,7 +522,8 @@ class AdminControllerBase extends BaseController
         $this->assign('session_admin', $model_admin, -1);
     }
 
-    protected function readHeaderToken(){
+    protected function readHeaderToken()
+    {
         return read_header_token();
     }