From 99755eea33cf009c36507df468c244f3be5b34c9 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 28 二月 2025 17:27:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
index f83bd97..4b436aa 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
@@ -100,12 +100,14 @@
List<Product> products = productMapper.selectList(Wrappers.<Product>lambdaQuery()
.eq(Product::getObjectId, id));
List<Integer> productIds = products.stream().map(Product::getId).collect(Collectors.toList());
- productPartMapper.delete(Wrappers.<ProductPart>lambdaQuery()
- .in(ProductPart::getProductId, productIds));
+ if (CollectionUtils.isNotEmpty(productIds)) {
+ productPartMapper.delete(Wrappers.<ProductPart>lambdaQuery()
+ .in(ProductPart::getProductId, productIds));
- // 鍒犻櫎浜у搧缁存姢
- productMapper.delete(Wrappers.<Product>lambdaQuery()
- .in(Product::getId, productIds));
+ // 鍒犻櫎浜у搧缁存姢
+ productMapper.delete(Wrappers.<Product>lambdaQuery()
+ .in(Product::getId, productIds));
+ }
return structureTestObjectMapper.deleteById(id);
}
--
Gitblit v1.9.3