From af79dcad7adbd69d6f329d5d779ece16862050e9 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 25 Aug 2022 14:27:58 +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=EF=BC=8C=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ParamsInfoEOController.java     |  6 ++----
 .../service/impl/ParamsInfoEOServiceImpl.java  | 18 +++++++-----------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
index 7723c44be..bad589083 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
@@ -137,8 +137,7 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 	@PostMapping(value = "/add")
 //	@RequiresPermissions("params:paramsInfo:add")
 	public Result<?> add(@Validated @RequestBody ParamsInfoEO paramsInfoEO) {
-		if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())
-				&& !ControlTypeEnum.Title.getValue().equals(paramsInfoEO.getControlType())) {
+		if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) {
 			return Result.error("认证类别不能为空！");
 		}
 		boolean isSuccess = paramsInfoEOService.add(paramsInfoEO);
@@ -160,8 +159,7 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 	@PostMapping(value = "/edit")
 	@RequiresPermissions("params:paramsInfo:edit")
 	public Result<?> edit(@Validated @RequestBody ParamsInfoEO paramsInfoEO) {
-		if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())
-				&& !ControlTypeEnum.Title.getValue().equals(paramsInfoEO.getControlType())) {
+		if (StringUtils.isEmpty(paramsInfoEO.getCertCategory())) {
 			return Result.error("认证类别不能为空！");
 		}
 		boolean isSuccess = paramsInfoEOService.editById(paramsInfoEO);
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 b2dadc5c4..e88b4368f 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
@@ -1311,6 +1311,13 @@ 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");
@@ -1332,17 +1339,6 @@ 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)