From f4d12a75ac185ba028a41d616b2e2d42e28a86b7 Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Thu, 30 Mar 2023 18:28:28 +0800
Subject: [PATCH] =?UTF-8?q?67335=20=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=B8=85=E5=8D=95=EF=BC=8C=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E4=BA=BA=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsCollectManifestEOServiceImpl.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 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 a8deb64c5..923a209a6 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
@@ -1704,8 +1704,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             paramsCollectManifestLogEOList.add(paramsCollectManifestLogEO);
         }
 
-        // 批量更新
-        paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList);
+        if(CollectionUtils.isNotEmpty(newConfigDataEOList)){
+            List<String> paramsCollectManifestIdList = newConfigDataEOList.stream().map(ParamsConfigDataEO::getParamsCollectManifestId).distinct().collect(Collectors.toList());
+            QueryWrapper<ParamsConfigDataEO> pcdRemoveWrap = new QueryWrapper<>();
+            pcdRemoveWrap.lambda().in(ParamsConfigDataEO::getParamsCollectManifestId,paramsCollectManifestIdList);
+            this.paramsConfigDataEOService.remove(pcdRemoveWrap);
+
+            newConfigDataEOList.forEach(newConfigDataEO -> {
+                newConfigDataEO.setId(UUID.randomUUID().toString().replace("-",""));
+            });
+            this.paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList);
+        }
+
+//        // 批量更新
+//        paramsConfigDataEOService.saveOrUpdateBatch(newConfigDataEOList);
 
         if (CollectionUtils.isNotEmpty(paramsCollectManifestLogEOList)) {
             this.paramsCollectManifestLogEOService.saveBatch(paramsCollectManifestLogEOList);