mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mula:09ea0c8f949ca1e211668ef91c3224a473a6e277
Branches Tags
mula:dev_1.0.1
mula:dev_1.0.2
mula:dev_1.0.0
mula:master
..
compare: mula:a3f03925699e4bf392e1eeed128781bb8a683f75
Branches Tags
mula:dev_1.0.1
mula:dev_1.0.2
mula:dev_1.0.0
mula:master

No commits in common. "09ea0c8f949ca1e211668ef91c3224a473a6e277" and "a3f03925699e4bf392e1eeed128781bb8a683f75" have entirely different histories.
09ea0c8f94 ... a3f0392569

1 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

5
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java
View File

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