From dc8977f6876bb4dabc2f1b6acc7814adc2b2558e Mon Sep 17 00:00:00 2001
From: wangzhijiang <1358525938@qq.com>
Date: Thu, 15 Jun 2023 17:49:48 +0800
Subject: [PATCH] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95-223?=
 =?UTF-8?q?=E6=9D=A1=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsReportDetailEOServiceImpl.java | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

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 684750ec1..fc8e14cdd 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
@@ -1398,11 +1398,12 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 									}
 
 									String configData = configDataBuilderTemp.toString();
-									if (configData.contains("#")) {
-										configData = configData.substring(0, configData.lastIndexOf("#"));
+									if(StringUtils.isNotEmpty(configData)){
+										if (configData.contains("#")) {
+											configData = configData.substring(0, configData.lastIndexOf("#"));
+										}
+										configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
 									}
-
-									configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
 								}
 							}
 
@@ -1423,7 +1424,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 					} else {
 						List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
 
-						StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
+						List<String> configDataList = new ArrayList<>(); // 重新组合配置数据
 
 						for (ParamsReportConfigDataEO paramsConfigDataEO : paramsReportConfigDataEOS) {
 							StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据
@@ -1458,17 +1459,15 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 							}
 
 							configData = configDataBuilderTemp.toString();
-							if (configData.contains("#")) {
-								configData = configData.substring(0, configData.lastIndexOf("#"));
+							if(StringUtils.isNotEmpty(configData)){
+								if (configData.contains("#")) {
+									configData = configData.substring(0, configData.lastIndexOf("#"));
+								}
+								configDataList.add(configData);
 							}
-
-							configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
 						}
 
-						String configDataStr = configDataBuilder.toString();
-						if (configDataStr.contains(paramsReportDetailVO.getSeparator())) {
-							configDataStr = configDataStr.substring(0, configDataStr.lastIndexOf(paramsReportDetailVO.getSeparator()));
-						}
+						String configDataStr = configDataList.stream().distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
 						record1.put("params_value", configDataStr);
 
 					}