bug修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/service/impl/BusMaterialbatchdemandplanServiceImpl.java

@@ -93,6 +93,7 @@ public class BusMaterialbatchdemandplanServiceImpl extends ServiceImpl<BusMateri
         bo1.setType("2");
         bo1.setWinningBidderId(bo.getSupplierId());
         List<BusBillofquantitiesLimitListVo> busBiddingPlanVos = busBiddingPlanService.getBillofquantitiesLimitListVo(bo1);
+        if (busBiddingPlanVos != null && !busBiddingPlanVos.isEmpty()) {
             Set<String> hashSet = new HashSet<>();
             busBiddingPlanVos.stream().forEach(vo -> {
                 hashSet.add(vo.getName()+"+"+vo.getSpecification());
@@ -105,6 +106,8 @@ public class BusMaterialbatchdemandplanServiceImpl extends ServiceImpl<BusMateri
             result.setRecords(list);
             return TableDataInfo.build(result);
         }
+        return null;
+    }
 
     /**
      * 查询符合条件的物资-批次需求计划列表

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/BusBiddingPlanServiceImpl.java

@@ -362,9 +362,11 @@ public class BusBiddingPlanServiceImpl extends ServiceImpl<BusBiddingPlanMapper,
     @Override
     public List<BusBillofquantitiesLimitListVo> getBillofquantitiesLimitListVo(BusBiddingPlanBo bo1) {
         List<Long> ids = baseMapper.getBillofquantitiesId(bo1.getType(),bo1.getWinningBidderId(),bo1.getProjectId());
-
+        if (ids!=null && !ids.isEmpty()){
             return busBillofquantitiesLimitListService.queryVoByIds(ids);
         }
+        return null;
+    }
 
     /**
      * 递归构建树形结构