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()); return; } - baseMapper.delete(Wrappers.lambdaQuery(PaintCostConfigEntity.class).notIn(PaintCostConfigEntity::getId, configs.stream().map(PaintCostConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet()))); + Set 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 forAdd = new ArrayList<>(); List 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()); return; } - baseMapper.delete(Wrappers.lambdaQuery(SteelsCostConfigEntity.class).notIn(SteelsCostConfigEntity::getId, configs.stream().map(SteelsCostConfig::getId).filter(Objects::nonNull).collect(Collectors.toSet()))); + Set 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 forAdd = new ArrayList<>(); List 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()); return; } - baseMapper.delete(Wrappers.lambdaQuery(VirtualWorkingEntity.class).notIn(VirtualWorkingEntity::getId, list.stream().map(VirtualWorking::getId).filter(Objects::nonNull).collect(Collectors.toSet()))); + Set 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 types = workingTypeService.list(); List forAdd = new ArrayList<>(); List forUpdate = new ArrayList<>(); @@ -79,6 +83,8 @@ public class VirtualWorkingService extends ServiceImpl 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)); + } } }