From 1221220503e356b655511355ccf33f0b2acd0f36 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Wed, 30 Mar 2022 22:41:52 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20bug=2050180=20=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E7=B1=BB=E5=9E=8B=E4=B8=BA=E5=8D=95=E9=80=89=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E4=B8=94=E5=AD=97=E7=AC=A6=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E9=95=BF=E5=BA=A6=E6=97=B6=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=A4=B1=E8=B4=A5=20[=E4=BF=AE=E6=94=B9]?=
 =?UTF-8?q?=E6=94=B9=E9=AD=94=E6=95=B0=E4=B8=BA=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OnlCgformTagServiceImpl.java | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
index bd50b081c..2b6b834ef 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
@@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.CutEnum;
+import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.document.enums.FieldTypeEnum;
+import com.jero.modules.enums.FixedFieldEnum;
 import com.jero.modules.system.service.impl.SysDictServiceImpl;
 import com.jero.modules.tag.entity.OnlCgformArea;
 import com.jero.modules.tag.entity.OnlCgformTag;
@@ -62,11 +64,11 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 		} else {
 			onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0);
 			onlCgformTag.setCgformHeadId(FileTableIdEnum.FILE_TABLE_ID.getValue());//设置文档库-表id
-			onlCgformTag.setDbIsKey(0);
-			onlCgformTag.setDbIsNull(1);
-			onlCgformTag.setDbPointLength(0);
-			onlCgformTag.setIsReadOnly(0);
-			onlCgformTag.setIsShowForm(1);
+			onlCgformTag.setDbIsKey(Integer.valueOf(YesOrNoEnum.NO.getValue()));
+			onlCgformTag.setDbIsNull(Integer.valueOf(YesOrNoEnum.YES.getValue()));
+			onlCgformTag.setDbPointLength(0); //默认为0
+			onlCgformTag.setIsReadOnly(Integer.valueOf(FixedFieldEnum.NON_FIXED_FIELD_ENUM.getValue()));
+			onlCgformTag.setIsShowForm(Integer.valueOf(YesOrNoEnum.YES.getValue()));
 			Date now = new Date();
 			onlCgformTag.setCreateTime(now);
 			onlCgformTag.setUpdateTime(now);
@@ -96,6 +98,11 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 			onlCgformTag.setDbType("Date");
 		}else{
 			onlCgformTag.setDbType("String");
+			if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.PULL_SINGLE.getValue())){
+				onlCgformTag.setDbLength(36); //单个ID的最大长度是36,所以单选默认设置为36
+			}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.PULL_MORE.getValue())){
+				onlCgformTag.setDbLength(2000); // 多选默认设置为2000,即可选择2000/36=55个属性
+			}
 		}
 		QueryWrapper<OnlCgformTag> queryWrapper = new QueryWrapper<>();
 		if (StringUtils.isNotBlank(onlCgformTag.getDbFieldName())) {
@@ -131,6 +138,11 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 			onlCgformTag.setDbType("Date");
 		}else{
 			onlCgformTag.setDbType("String");
+			if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.PULL_SINGLE.getValue())){
+				onlCgformTag.setDbLength(36); //单个ID的最大长度是36,所以单选默认设置为36
+			}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.PULL_MORE.getValue())){
+				onlCgformTag.setDbLength(2000); // 多选默认设置为2000,即可选择2000/36=55个属性
+			}
 		}
 		saveOrUpdate(onlCgformTag);
 	}