From c9cc74fad46adaa4bc448cba673e830baf705fce Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 24 六月 2025 17:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
index 91e9992..a39eb0e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
@@ -628,14 +628,18 @@
List<Long> ids = productMixList.stream().map(ProductMix::getId).collect(Collectors.toList());
//鑾峰彇宸茬粡鑷韩琚�熺敤鐨勯儴浠�
LambdaQueryWrapper<ComponentInfo> borrowQueryWrapper = new LambdaQueryWrapper<>();
- borrowQueryWrapper.in(ComponentInfo::getBorrowId,ids);
+ if (!ids.isEmpty()){
+ borrowQueryWrapper.in(ComponentInfo::getBorrowId,ids);
+ }
borrowQueryWrapper.eq(ComponentInfo::getParentId,componentInfo.getComponentId());
List<String> borrowIds= super.list(borrowQueryWrapper).stream().map(ComponentInfo::getBorrowId).collect(Collectors.toList());
LambdaQueryWrapper<ComponentInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(StrUtil.isNotEmpty(componentInfo.getComponentName()),ComponentInfo::getComponentName, componentInfo.getComponentName());
queryWrapper.like(StrUtil.isNotEmpty(componentInfo.getComponentCode()),ComponentInfo::getComponentCode, componentInfo.getComponentCode());
queryWrapper.isNull(ComponentInfo::getBorrowId);
- queryWrapper.in(ComponentInfo::getComponentId,ids);
+ if (!ids.isEmpty()){
+ queryWrapper.in(ComponentInfo::getComponentId,ids);
+ }
queryWrapper.ne(StrUtil.isNotEmpty(oldComponentInfo.getBorrowId()),ComponentInfo::getComponentId,oldComponentInfo.getBorrowId());
if (!borrowIds.isEmpty()) {
queryWrapper.notIn(ComponentInfo::getComponentId,borrowIds);
--
Gitblit v1.9.3