diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java index a7091c93..90c18b42 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.sip.service.impl; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; @@ -108,9 +109,9 @@ public class DeliveryListServiceImpl implements IDeliveryListService { @Override public AjaxResult importData(List deliveryList, Long deliveryId) { - List productCodeList = deliveryList.stream().map(DeliveryList::getProductCode).collect(Collectors.toList()); + List productCodeList = deliveryList.stream().map(DeliveryList::getProductCode).filter(Objects::nonNull).collect(Collectors.toList()); if (productCodeList.isEmpty()) { - return AjaxResult.error("产品编码为空"); + return AjaxResult.error("文件为空或产品编码为空"); } List orderLists = infoMapper.listOrderListByDeliveryId(deliveryId); if (orderLists.isEmpty()) {