From edc78f9e1bb1daf609c6bc532d01ced807c84bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Wed, 4 Dec 2024 10:48:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=AE=BE=E8=AE=A1=E6=88=90=E6=9C=AC?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4):=20=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../technology/service/PaintCostConfigService.java     |  6 +++++-
 .../technology/service/SteelsCostConfigService.java    |  6 +++++-
 .../technology/service/VirtualWorkingService.java      | 10 ++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/PaintCostConfigService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/PaintCostConfigService.java
index bbfddbf5..24f0f8b2 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/PaintCostConfigService.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/PaintCostConfigService.java
@@ -16,6 +16,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -28,7 +29,10 @@ public class PaintCostConfigService extends ServiceImpl<PaintCostConfigMapper, P
             remove(new QueryWrapper<>());
             return;
         }
-        baseMapper.delete(Wrappers.lambdaQuery(PaintCostConfigEntity.class).notIn(PaintCostConfigEntity::getId, configs.stream().map(PaintCostConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet())));
+        Set<Integer> ids = configs.stream().map(PaintCostConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet());
+        if (CollectionUtil.isNotEmpty(ids)) {
+            baseMapper.delete(Wrappers.lambdaQuery(PaintCostConfigEntity.class).notIn(PaintCostConfigEntity::getId, ids));
+        }
         List<PaintCostConfigEntity> forAdd = new ArrayList<>();
         List<PaintCostConfigEntity> forUpdate = new ArrayList<>();
         configs.forEach(c -> {
diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/SteelsCostConfigService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/SteelsCostConfigService.java
index da5fe2e9..ab193f00 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/SteelsCostConfigService.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/SteelsCostConfigService.java
@@ -16,6 +16,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -28,7 +29,10 @@ public class SteelsCostConfigService extends ServiceImpl<SteelsCostConfigMapper,
             remove(new QueryWrapper<>());
             return;
         }
-        baseMapper.delete(Wrappers.lambdaQuery(SteelsCostConfigEntity.class).notIn(SteelsCostConfigEntity::getId, configs.stream().map(SteelsCostConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet())));
+        Set<Integer> ids = configs.stream().map(SteelsCostConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet());
+        if (CollectionUtil.isNotEmpty(ids)) {
+            baseMapper.delete(Wrappers.lambdaQuery(SteelsCostConfigEntity.class).notIn(SteelsCostConfigEntity::getId, ids));
+        }
         List<SteelsCostConfigEntity> forAdd = new ArrayList<>();
         List<SteelsCostConfigEntity> forUpdate = new ArrayList<>();
         configs.forEach(c -> {
diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/VirtualWorkingService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/VirtualWorkingService.java
index 84e58afc..cd21413d 100644
--- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/VirtualWorkingService.java
+++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/VirtualWorkingService.java
@@ -19,6 +19,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -38,7 +39,10 @@ public class VirtualWorkingService extends ServiceImpl<VirtualWorkingMapper, Vir
             remove(new QueryWrapper<>());
             return;
         }
-        baseMapper.delete(Wrappers.lambdaQuery(VirtualWorkingEntity.class).notIn(VirtualWorkingEntity::getId, list.stream().map(VirtualWorking::getId).filter(Objects::nonNull).collect(Collectors.toSet())));
+        Set<Integer> ids = list.stream().map(VirtualWorking::getId).filter(Objects::nonNull).collect(Collectors.toSet());
+        if (CollectionUtil.isNotEmpty(ids)) {
+            baseMapper.delete(Wrappers.lambdaQuery(VirtualWorkingEntity.class).notIn(VirtualWorkingEntity::getId, ids));
+        }
         List<WorkingTypeEntity> types = workingTypeService.list();
         List<VirtualWorkingEntity> forAdd = new ArrayList<>();
         List<VirtualWorkingEntity> forUpdate = new ArrayList<>();
@@ -79,6 +83,8 @@ public class VirtualWorkingService extends ServiceImpl<VirtualWorkingMapper, Vir
 
     @Transactional
     public void deleteNotInNames(@NotNull List<String> collect) {
-        baseMapper.delete(Wrappers.lambdaQuery(VirtualWorkingEntity.class).notIn(VirtualWorkingEntity::getName, collect));
+        if (CollectionUtil.isNotEmpty(collect)) {
+            baseMapper.delete(Wrappers.lambdaQuery(VirtualWorkingEntity.class).notIn(VirtualWorkingEntity::getName, collect));
+        }
     }
 }