From 4051cfae46300243b59b8c2a0d2ac69d975fd977 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 20 May 2022 10:54:19 +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

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java      | 4 ++--
 1 file changed, 2 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 877850cf0..e18b16f02 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
@@ -1047,12 +1047,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
 		String[] targetConfigIdStr = targetConfigIds.split(",");
 
-		ParamsConfigDataEO sourceConfigDataEO = paramsConfigDataEOService.getById(sourceConfigId);
 		List<ParamsConfigDataEO> updateConfigDataEOList = 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)) {
+				if (ObjectUtil.isNotEmpty(targetConfigDataEO) && sourceConfigDataEO != null) {
 					ParamsConfigDataEO updateConfigDataEO = new ParamsConfigDataEO();
 					updateConfigDataEO.setId(targetConfigDataEO.getId());
 					updateConfigDataEO.setTextData(sourceConfigDataEO.getTextData());