From 62a1c1795edae9286782ba9b60cc3d261cdb0128 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 13 Dec 2022 11:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=8C=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=B8=ADvalue=E5=80=BC=E5=8A=A0=E5=BC=95=E5=8F=B7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsReportDetailEOServiceImpl.java | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 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 dade0f196..19d483843 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
@@ -1694,7 +1694,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 
 			// 添加配置数据
 			for (Map.Entry<String, Object> entry : map.entrySet()) {
-				if ("id".equals(entry.getKey())) {
+				String key = entry.getKey();
+				if ("id".equals(key)) {
 					continue;
 				}
 
@@ -1732,18 +1733,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 						if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) {
 							paramsReportConfigDataEO.setTextData(dataValue);
 							if (StringUtils.isEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue)) {
-								logCnContent.append("空").append("改为").append(dataValue).append("，");
-								logEnContent.append(" from ").append("Null").append(" to ").append(dataValue).append(", ");
+								logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
+								logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
 
 								changeFlag = true;
 							} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isEmpty(dataValue)) {
-								logCnContent.append(oldConfigDataEO.getTextData()).append("改为").append("空").append("，");
-								logEnContent.append(" from ").append(oldConfigDataEO.getTextData()).append(" to ").append("Null").append(", ");
+								logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，");
+								logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
 
 								changeFlag = true;
 							} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getTextData().equals(dataValue)) {
-								logCnContent.append(oldConfigDataEO.getTextData()).append("改为").append(dataValue).append("，");
-								logEnContent.append(" from ").append(oldConfigDataEO.getTextData()).append(" to ").append(dataValue).append(", ");
+								logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
+								logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
 
 								changeFlag = true;
 							}
@@ -1753,18 +1754,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 							paramsReportConfigDataEO.setPullData(dataValue);
 
 							if (StringUtils.isEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue)) {
-								logCnContent.append("空").append("改为").append(dataValue).append("，");
-								logEnContent.append(" from ").append("Null").append(" to ").append(dataValue).append(", ");
+								logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
+								logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
 
 								changeFlag = true;
 							} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isEmpty(dataValue)) {
-								logCnContent.append(oldConfigDataEO.getPullData()).append("改为").append("空").append("，");
-								logEnContent.append(" from ").append(oldConfigDataEO.getPullData()).append(" to ").append("Null").append(", ");
+								logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append("空").append("\"").append("，");
+								logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
 
 								changeFlag = true;
 							} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getPullData().equals(dataValue)) {
-								logCnContent.append(oldConfigDataEO.getPullData()).append("改为").append(dataValue).append("，");
-								logEnContent.append(" from ").append(oldConfigDataEO.getPullData()).append(" to ").append(dataValue).append(", ");
+								logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append("，");
+								logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
 
 								changeFlag = true;
 							}
@@ -1807,21 +1808,21 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 							}
 							paramsReportConfigDataEO.setFileConnectId(dataValue);
 							if (StringUtils.isEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
-								logCnContent.append("空").append("改为").append(newFileNames).append("，");
-								logEnContent.append(" from ").append("Null").append(" to ").append(newFileNames).append(", ");
+								logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，");
+								logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", ");
 
 								changeFlag = true;
 							} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isEmpty(dataValue)) {
 								String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
-								logCnContent.append(oldFileNames).append("改为").append("空").append("，");
-								logEnContent.append(" from ").append(oldFileNames).append(" to ").append("Null").append(", ");
+								logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append("空").append("\"").append("，");
+								logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
 
 								changeFlag = true;
 							} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
 								String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
 								if (!oldConfigDataEO.getFileConnectId().equals(dataValue)) {
-									logCnContent.append(oldFileNames).append("改为").append(newFileNames).append("，");
-									logEnContent.append(" from ").append(oldFileNames).append(" to ").append(newFileNames).append(", ");
+									logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append(newFileNames).append("\"").append("，");
+									logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", ");
 
 									changeFlag = true;
 								}