From 54c0b79ac20b42731dd78d5b18fe812e73723f59 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 11 Apr 2025 18:43:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(sip):=20=E4=BC=98=E5=8C=96=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在导入数据时，过滤掉产品编码为空的项，避免因空值导致的错误
- 修改错误提示信息，使其更加准确地反映问题所在
---
 .../com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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> deliveryList, Long deliveryId) {
-        List<String> productCodeList = deliveryList.stream().map(DeliveryList::getProductCode).collect(Collectors.toList());
+        List<String> productCodeList = deliveryList.stream().map(DeliveryList::getProductCode).filter(Objects::nonNull).collect(Collectors.toList());
         if (productCodeList.isEmpty()) {
-          return   AjaxResult.error("产品编码为空");
+          return   AjaxResult.error("文件为空或产品编码为空");
         }
         List<OrderList> orderLists = infoMapper.listOrderListByDeliveryId(deliveryId);
         if (orderLists.isEmpty()) {