From 92677adbf3fa3ecfa82e6f8a2d78fb9cf51524a5 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 4 Nov 2022 11:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF-=E5=AF=BC=E5=85=A5=E6=8E=A7=E4=BB=B6=E5=A4=87?=
 =?UTF-8?q?=E9=80=89=E5=80=BC=E6=A0=A1=E9=AA=8Cbug61759?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsInfoEOServiceImpl.java         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
index 90c23b1e2..3c025261d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
@@ -1348,7 +1348,18 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 					|| ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)
 					|| ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)
 					|| ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
+				String controlValuesRegex = "^[^##！!]*$";
+				if (StringUtils.isNotEmpty(controlValues) && !controlValues.matches(controlValuesRegex)) {
+					if(CutEnum.CN.getValue().equals(cut)) {
+						errorMsg += "控件备选值格式错误，不能包含中英文感叹号和井号；";
+					} else {
+						errorMsg += "Component Value formatting errors, can not chinese and English exclamation points and pound signs; ";
+					}
+					countError++;
+				}
+
 				resultMap = validateMustAndLength(controlValues, "控件备选值", "Component Value", IsMustEnum.YES.getValue(), "500", false, cut);
+
 			} else {
 				resultMap = validateMustAndLength(controlValues, "控件备选值", "Component Value", IsMustEnum.NO.getValue(), "500", false, cut);
 				dto.setControlValues(null);