From 435cc74e0898a0e7eb70135282cb1d8bc516a7dc Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Wed, 29 Mar 2023 15:04:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E5=A1=AB=E5=86=99=E4=BA=BA=E5=AF=BC=E5=85=A5=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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 715725108..a8deb64c5 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
@@ -4007,11 +4007,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             }
         }
 
-        for (ParamsConfigDataEO paramsConfigDataEO : configDataList) {
+        List<String> paramsCollectManifestIdList = configDataList.stream().map(ParamsConfigDataEO::getParamsCollectManifestId).distinct().collect(Collectors.toList());
+        for (String paramsCollectManifestId : paramsCollectManifestIdList) {
             // 删除之前的参数项
             QueryWrapper<ParamsConfigDataEO> targetConfigDataRemoveWrap = new QueryWrapper<>();
-            targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigDataEO.getParamsConfigId());
-            targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsConfigDataEO.getParamsCollectManifestId());
+            targetConfigDataRemoveWrap.lambda().eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
             this.paramsConfigDataEOService.remove(targetConfigDataRemoveWrap);
         }
 
@@ -5893,7 +5893,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
                 /*if (StringUtils.isNotEmpty(configDataEO.getId())) {
                     configDataList.add(configDataEO);
                 }*/
-                configDataList.add(configDataEO);
+                // 如果表格里的参数不为空，则进行添加。
+                if(StringUtils.isNotBlank(value)){
+                    configDataList.add(configDataEO);
+                }
             }
 
             if (countError > 0) {