From 11201aa1a6a35ec576056916378e1f9a0f83dc65 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Fri, 24 Mar 2023 15:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93=2066951=20=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java     | 5 ++++-
 .../report/service/impl/ParamsReportDetailEOServiceImpl.java | 5 ++++-
 2 files changed, 8 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 97ab1d71f..2e6b61e4c 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
@@ -1743,7 +1743,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                         for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
 
                             String type = (String) paramsConfigDataVO.get("type");
-                            String dataValue = (String) paramsConfigDataVO.get("dataValue");
+                            String dataValue = "";
+                            if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){
+                                dataValue = String.valueOf(paramsConfigDataVO.get("dataValue"));
+                            }
 
                             if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) {
                                 paramsConfigDataEO.setTextData(dataValue);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index b151f9ca5..9724c1dcf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -1838,7 +1838,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 						paramsReportConfigDataEO.setOrderNum(orderNum);
 						for (Map<String, Object> paramsConfigDataVO : configDataVOList) {
 							String type = (String) paramsConfigDataVO.get("type");
-							String dataValue = (String) paramsConfigDataVO.get("dataValue");
+							String dataValue = "";
+							if(ObjectUtils.isNotEmpty(paramsConfigDataVO.get("dataValue"))){
+								dataValue = String.valueOf(paramsConfigDataVO.get("dataValue"));
+							}
 
 							// 判断是新增还是修改
 							ParamsConfigDataEO oldConfigDataEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsReportConfigEOId, paramsCollectManifestId, paramsReportConfigDataEOList,configDataId);