From 95c2858a6407d4146fb144cda37b83c775b340be Mon Sep 17 00:00:00 2001
From: dfdg <2710245601@qq.com>
Date: Sat, 6 Sep 2025 18:33:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...BusMaterialbatchdemandplanServiceImpl.java | 25 +++++++++++--------
 .../impl/BusBiddingPlanServiceImpl.java       |  6 +++--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java
index dce2c814..c65d9d5e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java
@@ -93,17 +93,20 @@ public class BusMaterialbatchdemandplanServiceImpl extends ServiceImpl<BusMateri
         bo1.setType("2");
         bo1.setWinningBidderId(bo.getSupplierId());
         List<BusBillofquantitiesLimitListVo> busBiddingPlanVos = busBiddingPlanService.getBillofquantitiesLimitListVo(bo1);
-        Set<String> hashSet = new HashSet<>();
-        busBiddingPlanVos.stream().forEach(vo -> {
-            hashSet.add(vo.getName()+"+"+vo.getSpecification());
-        });
-        Page<BusMaterialbatchdemandplanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        List<BusMaterialbatchdemandplanVo> list = result.getRecords().stream().filter(vo -> {
-            String key = vo.getName() + "+" + vo.getSpecification(); // 拼接字符串（需与 Set 中格式一致）
-            return hashSet.contains(key); // 仅保留 Set 中存在的数据
-        }).toList();
-        result.setRecords(list);
-        return TableDataInfo.build(result);
+        if (busBiddingPlanVos != null && !busBiddingPlanVos.isEmpty()) {
+            Set<String> hashSet = new HashSet<>();
+            busBiddingPlanVos.stream().forEach(vo -> {
+                hashSet.add(vo.getName()+"+"+vo.getSpecification());
+            });
+            Page<BusMaterialbatchdemandplanVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+            List<BusMaterialbatchdemandplanVo> list = result.getRecords().stream().filter(vo -> {
+                String key = vo.getName() + "+" + vo.getSpecification(); // 拼接字符串（需与 Set 中格式一致）
+                return hashSet.contains(key); // 仅保留 Set 中存在的数据
+            }).toList();
+            result.setRecords(list);
+            return TableDataInfo.build(result);
+        }
+        return null;
     }
 
     /**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java
index 73661c43..14421e31 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java
@@ -362,8 +362,10 @@ public class BusBiddingPlanServiceImpl extends ServiceImpl<BusBiddingPlanMapper,
     @Override
     public List<BusBillofquantitiesLimitListVo> getBillofquantitiesLimitListVo(BusBiddingPlanBo bo1) {
         List<Long> ids = baseMapper.getBillofquantitiesId(bo1.getType(),bo1.getWinningBidderId(),bo1.getProjectId());
-
-        return busBillofquantitiesLimitListService.queryVoByIds(ids);
+        if (ids!=null && !ids.isEmpty()){
+            return busBillofquantitiesLimitListService.queryVoByIds(ids);
+        }
+        return null;
     }
 
     /**