From 598937f1918eb1c25cc0ca7b5bf2bfd5190bc2c9 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 31 Oct 2022 16:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95-=E5=A1=AB=E5=86=99=E4=BA=BA?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index c0c991fda..a67d5f414 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -3837,7 +3837,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	private Map<String, Object> validatePull(String configName, String controlValues, String value, String mustInput, Boolean isSingle, String cut) {
 		String errorMsg = "";
 		int countError= 0;
-		List<String> controlValueList = Arrays.asList(controlValues.split(","));
+		List<String> controlValueList = Arrays.asList(controlValues.replaceAll("，", ",").split(","));
 		Map<String, Object> resultMap = new HashMap<>();
 //		StringBuilder newValue = new StringBuilder();
 
@@ -3854,7 +3854,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		if (StringUtils.isNotEmpty(value)) {
 			//判断是否是单选
 			if (isSingle) {
-				if (StringUtils.isNotBlank(value) && value.contains(",")) {
+				if (StringUtils.isNotBlank(value) && (value.contains("！") ||value.contains("!"))) {
 					if (CutEnum.CN.getValue().equals(cut)) {
 						errorMsg += configName + "为单选项；";
 					} else {