From 8924689f49289286c0e622a83e5ac224a7396ff6 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 18 Aug 2022 16:58:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93-?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B-=E5=AF=BC=E5=87=BA-bug58360,58358?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsReportDetailEOServiceImpl.java | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

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 e49a8b082..5ac86ab0a 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
@@ -802,6 +802,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 							}
 						}
 						if (CollectionUtil.isNotEmpty(allRelevFileList)) {
+							allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList());
+
 							String exportFile = "导出文件";
 							if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
 								exportFile = "Export file";
@@ -934,6 +936,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 							}
 						}
 						if (CollectionUtil.isNotEmpty(allRelevFileList)) {
+							allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList());
+
 							String exportFile = "导出文件";
 							if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) {
 								exportFile = "Export file";
@@ -1090,12 +1094,12 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 							String paramsConfigId = paramsConfigEO.getId();
 							ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
 							StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
-							if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
-								configDataBuilder.append(paramsConfigDataEO.getTextData()).append("#");
-							}
 							if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
 								configDataBuilder.append(paramsConfigDataEO.getPullData()).append("#");
 							}
+							if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
+								configDataBuilder.append(paramsConfigDataEO.getTextData()).append("#");
+							}
 							if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
 								List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId());
 								if (CollectionUtil.isNotEmpty(ossFileList)) {
@@ -1128,7 +1132,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 								.map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
 
 						List<String> fileNameList = new ArrayList<>();
-						paramsReportConfigDataEOS.forEach(paramsReportConfigDataEO -> {
+						for(ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOS) {
 							if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) {
 								List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId());
 								if (CollectionUtil.isNotEmpty(ossFileList)) {
@@ -1137,16 +1141,17 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 									fileList.addAll(ossFileList);
 								}
 							}
-						});
+						}
 
 						StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
-						if (StringUtils.isNotEmpty(textDatas)) {
-							configDataBuilder.append(textDatas).append("#");
-						}
 						if (StringUtils.isNotEmpty(pullDatas)) {
 							configDataBuilder.append(pullDatas).append("#");
 						}
+						if (StringUtils.isNotEmpty(textDatas)) {
+							configDataBuilder.append(textDatas).append("#");
+						}
 						if (CollectionUtil.isNotEmpty(fileNameList)) {
+							fileNameList = fileNameList.stream().distinct().collect(Collectors.toList());
 							configDataBuilder.append(StringUtils.join(fileNameList, paramsReportDetailVO.getSeparator())).append("#");
 						}
 						configData = configDataBuilder.toString();
@@ -1260,12 +1265,12 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 						begin += bytes.length;
 					}
 
-					if (StringUtils.isNotEmpty(textDatas)) {
-						configDataBuilder.append(textDatas).append("#"); //
-					}
 					if (StringUtils.isNotEmpty(pullDatas)) {
 						configDataBuilder.append(pullDatas).append("#"); //
 					}
+					if (StringUtils.isNotEmpty(textDatas)) {
+						configDataBuilder.append(textDatas).append("#"); //
+					}
 					configData = configDataBuilder.toString();
 					if (configData.contains("#")) { //
 						configData = configData.substring(0, configData.lastIndexOf("#"));
@@ -1279,13 +1284,14 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 
 				} else {
 
-					if (StringUtils.isNotEmpty(textDatas)) {
-						configDataBuilder.append(textDatas).append("#");
-					}
 					if (StringUtils.isNotEmpty(pullDatas)) {
 						configDataBuilder.append(pullDatas).append("#");
 					}
+					if (StringUtils.isNotEmpty(textDatas)) {
+						configDataBuilder.append(textDatas).append("#");
+					}
 					if (CollectionUtil.isNotEmpty(fileNameList)) {
+						fileNameList = fileNameList.stream().distinct().collect(Collectors.toList()); // 去重
 						configDataBuilder.append(StringUtils.join(fileNameList, ",")).append("#");
 					}
 					configData = configDataBuilder.toString();