From 60876d9a0d9e73f822db91e2d81e2ec5dc745a06 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 2 Feb 2023 17:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B8=85=E5=8D=95=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86-=E6=8E=A7=E4=BB=B6=E6=A0=A1=E9=AA=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9-=E5=A1=AB=E5=86=99=E4=BA=BA=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java       | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 8f14f2d67..7e56e0906 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -3666,6 +3666,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			if (checkObjAllFieldsIsNull(importDto)) {
 				continue;
 			}
+
+			// 如果id为空，不做处理
+			if(StringUtils.isEmpty(importDto.getId())){
+				continue;
+			}
+
 			// 处理文件
 			if (StringUtils.isNotBlank(importDto.getFileConnectId())) { // 判空，否则报空指针异常
 				List<File> nowFileList = FileUnZip.readFileByFilename(unzipfilepath, importDto.getFileConnectId(), null, null, null, null, null);
@@ -5376,7 +5382,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						countError ++;
 					}
                 }
-				configDataList.add(configDataEO);
+				if(StringUtils.isNotEmpty(configDataEO.getId())){
+					configDataList.add(configDataEO);
+				}
 			}
 
 			if (countError > 0) {