From 09c0b3134d044de09c82319f6cc6f3f40c65a1b3 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 7 Jun 2022 23:12:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=BC=95=E7=94=A8=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 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 290555de2..562c1ce5e 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
@@ -1078,22 +1078,37 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		String[] targetConfigIdStr = targetConfigIds.split(",");
 
 		List<ParamsConfigDataEO> updateConfigDataEOList = new ArrayList<>();
+		List<ParamsConfigDataEO> addConfigDataEOList = new ArrayList<>();
 		for (int i=0; i<paramsCollectManifestIdStr.length; i++) {
-			for (int j=0; j<targetConfigIdStr.length; j++) {
-				ParamsConfigDataEO sourceConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(sourceConfigId, paramsCollectManifestIdStr[i]);
-				ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
-				if (ObjectUtil.isNotEmpty(targetConfigDataEO) && sourceConfigDataEO != null) {
-					ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
-					updateConfigDataEO.setId(targetConfigDataEO.getId());
-					updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData());
-					updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData());
-					updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId());
-					updateConfigDataEOList.add(updateConfigDataEO);
+			ParamsConfigDataEO sourceConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(sourceConfigId, paramsCollectManifestIdStr[i]);
+			if (ObjectUtil.isNotEmpty(sourceConfigDataEO)) {
+				for (int j = 0; j < targetConfigIdStr.length; j++) {
+					ParamsConfigDataEO targetConfigDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(targetConfigIdStr[j], paramsCollectManifestIdStr[i]);
+					if (ObjectUtil.isNotEmpty(targetConfigDataEO)) {
+						ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
+						updateConfigDataEO.setId(targetConfigDataEO.getId());
+						updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData());
+						updateConfigDataEO.setPullData(sourceConfigDataEO.getPullData());
+						updateConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId());
+						updateConfigDataEOList.add(updateConfigDataEO);
+					} else {
+						ParamsConfigDataEO addConfigDataEO = new ParamsConfigDataEO();
+						addConfigDataEO.setParamsConfigId(targetConfigIdStr[j]);
+						addConfigDataEO.setParamsCollectManifestId(paramsCollectManifestIdStr[i]);
+						addConfigDataEO.setTextData(sourceConfigDataEO.getTextData());
+						addConfigDataEO.setPullData(sourceConfigDataEO.getPullData());
+						addConfigDataEO.setFileConnectId(sourceConfigDataEO.getFileConnectId());
+						addConfigDataEOList.add(addConfigDataEO);
+					}
 				}
+			} else {
+				return false;
 			}
 		}
 
-		return paramsConfigDataEOService.updateBatchById(updateConfigDataEOList);
+		paramsConfigDataEOService.saveBatch(addConfigDataEOList);
+		paramsConfigDataEOService.updateBatchById(updateConfigDataEOList);
+		return true;
 	}
 
 	@Override