From ea7999c5e2e1e9cbe16173403749f8a3ebea39c8 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 9 Aug 2022 10:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9-?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E7=B1=BB=E5=9E=8B=E6=A0=A1=E9=AA=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsInfoEOServiceImpl.java | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
index fded8057a..176b3acdd 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
@@ -1171,7 +1171,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		List<String> stringMessage = new ArrayList<>();
 		List<String> nioNumberImport = new ArrayList<>(); // 记录导入的nio编号
 
-		int i = 1;    //记录行号
+		int i = 2;    //记录行号
 		//循环验证数据
 		for (ParamsInfoCnImport dto : paramsInfoEOList) {
 			//判断此行数据是否全部为空,是则不读取
@@ -1278,13 +1278,6 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			errorMsg += (String)resultMap.get("errorMsg");
 			countError += (int)resultMap.get("countError");
 
-			// 认证类别
-			// 来源：认证类别sheet页
-			resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.YES.getValue(), "1000", false, cut);
-			errorMsg += (String)resultMap.get("errorMsg");
-			countError += (int)resultMap.get("countError");
-			dto.setCertCategory(nioCertCategoryMap.get(nioNumber));
-
 //			String certCategory = dto.getCertCategory();
 //			resultMap = validateMustAndLength(certCategory, "认证类别", "cert category", IsMustEnum.YES.getValue(), "1000", false, cut);
 //			errorMsg += (String)resultMap.get("errorMsg");
@@ -1306,6 +1299,17 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			controlType = (String)resultMap.get("value");
 			dto.setControlType(controlType);
 
+			// 认证类别
+			// 来源：认证类别sheet页
+			if (ControlTypeEnum.Title.getValue().equals(controlType)) {
+				resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.NO.getValue(), "1000", false, cut);
+			} else {
+				resultMap = validateMustAndLength(nioCertCategoryMap.get(nioNumber), "认证类别", "Cert Category", IsMustEnum.YES.getValue(), "1000", false, cut);
+			}
+			errorMsg += (String)resultMap.get("errorMsg");
+			countError += (int)resultMap.get("countError");
+			dto.setCertCategory(nioCertCategoryMap.get(nioNumber));
+
 			// 控件备选值
 			String controlValues = dto.getControlValues();
 			if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)
@@ -1352,7 +1356,6 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 				dto.setControlVerify(null);
 			}
 
-
 			// 标题默认值
 			String titleDefaultValue = dto.getTitleDefaultValue();
 			if (ControlTypeEnum.Title.getValue().equals(controlType)) {
@@ -1427,7 +1430,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 
 			List<String> ccNioNumberImport = new ArrayList<>(); // 记录导入的nio编号
 
-			int j = 1;
+			int j = 2;
 			for (CertCategoryParamsInfoCnImport ccDto : ccDtoList) {
 				//判断此行数据是否全部为空,是则不读取
 				if (checkObjAllFieldsIsNull(ccDto)) {