From ec5b57fa3916c461a6b8c240f264ee967dae516c Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 4 Aug 2022 14:17:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93-?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B-=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98-=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java     | 12 ++++++++++++
 .../impl/ParamsReportDetailEOServiceImpl.java        |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 9da886739..9efca35d4 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1936,6 +1936,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					addReportDetailEO.setParamsManifestId(reportId);
 					addReportDetailEO.setSyncTime(syncTime);
 					addReportDetailEOList.add(addReportDetailEO);
+
+					// 添加配置数据
+					for (ParamsConfigEO configEO : paramsConfigEOList) {
+						ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO();
+						addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-",""));
+						addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
+						addReportConfigDataEO.setParamsCollectManifestId(reportDetailId);
+						addReportConfigDataEO.setTextData(item.getTitleDefaultValue()); //标题默认值
+
+						addReportConfigDataEOList.add(addReportConfigDataEO);
+
+					}
 				}
 			}
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 0330b1067..5dffa3509 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -423,8 +423,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
 			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
 			configDataVO.setIsLock(paramsConfigEO.getIsLock());
-			if (StringUtils.isNotEmpty(paramsCollectManifestEO.getTitleDefaultValue())) {
-				configDataVO.setDataValue(paramsCollectManifestEO.getTitleDefaultValue());
+			if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
+				configDataVO.setDataValue(paramsConfigDataEO.getTextData());
 			}
 			paramsConfigDataVOList.add(configDataVO);