From 25e6e922a8fc17813f1207697f619320d00a54ba Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Thu, 4 Jan 2024 17:48:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=90=8D=E7=A7=B0=E9=95=BF=E5=BA=A6=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=94=B9=E4=B8=BA50=E4=B8=AA=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flossom/common/core/domain/entity/SysTag.java   |  1 -
 flossom-ui/src/views/system/wechatTag/index.vue     | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysTag.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysTag.java
index a97290e..52940d1 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysTag.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysTag.java
@@ -88,7 +88,6 @@ public class SysTag extends BaseEntity
     }
 
     @NotBlank(message = "标签名称不能为空")
-    @Size(min = 0, max = 50, message = "标签名称长度不能超过50个字符")
     public String getTagName()
     {
         return tagName;
diff --git a/flossom-ui/src/views/system/wechatTag/index.vue b/flossom-ui/src/views/system/wechatTag/index.vue
index 83da034..35d570d 100644
--- a/flossom-ui/src/views/system/wechatTag/index.vue
+++ b/flossom-ui/src/views/system/wechatTag/index.vue
@@ -108,7 +108,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="标签名称" prop="tagName">
-              <el-input v-model="form.tagName" placeholder="请输入标签名称" maxlength="50"/>
+              <el-input v-model="form.tagName" placeholder="请输入标签名称"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -274,6 +274,17 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function() {
+      if(this.form.parentId != null) {
+        if(this.form.tagName.length > 100) {
+          this.$modal.msgError("标签名称不能大于100个字符");
+          return;
+        }
+      } else {
+        if(this.form.tagName.length > 50) {
+          this.$modal.msgError("标签名称不能大于50个字符");
+          return;
+        }
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.form.type = 1;