From c0375616724bc96dd1ef25230efa975c779aa7fc Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Thu, 13 Mar 2025 09:56:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E6=A8=AA?=
 =?UTF-8?q?=E5=B9=85=EF=BC=88=E5=88=86=E7=B1=BB=EF=BC=89=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=A0=87=E8=AF=86=E9=AA=8C=E8=AF=81=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/Banner.php          |  2 +-
 app/admin/validate/v1/SysBannerValidate.php | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/admin/controller/v1/Banner.php b/app/admin/controller/v1/Banner.php
index fbe23fd9..495bfa7a 100644
--- a/app/admin/controller/v1/Banner.php
+++ b/app/admin/controller/v1/Banner.php
@@ -69,7 +69,7 @@ class Banner
             'name',
             'desc',
             'recommend',
-            'unique_label' => '',
+            'unique_label',
             'at_platform'  => 'pc',
             'status'       => 1
         ]);
diff --git a/app/admin/validate/v1/SysBannerValidate.php b/app/admin/validate/v1/SysBannerValidate.php
index 36df084b..f7349e46 100644
--- a/app/admin/validate/v1/SysBannerValidate.php
+++ b/app/admin/validate/v1/SysBannerValidate.php
@@ -51,26 +51,22 @@ class SysBannerValidate extends Validate
     // 新增场景
     public function sceneAdd()
     {
-        return $this->remove('id', 'require|integer');
+        return $this->remove('id', 'require|integer')->append('unique_label', 'require');
     }
 
     // 编辑场景
     public function sceneEdit()
     {
-        return $this->remove('language_id', 'require|integer')->append('unique_label', 'empty');
+        return $this->remove('language_id', 'require|integer')->append('unique_label', 'mustOmit');
     }
 
     // 验证是否为空
-    protected function empty($value, $rule, $data)
+    protected function mustOmit($value, $rule, $data)
     {
         if (!isset($data['unique_label'])) {
             return true;
         }
 
-        if (is_null($value) || $value == '') {
-            return true;
-        }
-
         return "unique_label必须为空";
     }
 }