diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 365e5b67d..b012ed703 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -3081,7 +3081,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadScanIds = unloadPackageList.stream() .map(UnloadPackageVO::getCarsLoadScanId) .collect(Collectors.toList()); - List scanZeroDetailList = scanZeroDetailService.findListByCarsLoadScanIds(carsLoadScanIds); - //把scanZeroDetailList中所有元素通过id进行分组 - Map> scanZeroDetailMap = scanZeroDetailList.stream() - .collect(Collectors.groupingBy(TrunklineScanZeroDetailVO::getScanId)); - - unloadPackageList.forEach(unloadPackageVO -> { - Long carsLoadScanId = unloadPackageVO.getCarsLoadScanId(); - List list = scanZeroDetailMap.get(carsLoadScanId); - unloadPackageVO.setScanZeroDetailList(list); - }); + if(CollUtil.isNotEmpty(carsLoadScanIds)){ + List scanZeroDetailList = scanZeroDetailService.findListByCarsLoadScanIds(carsLoadScanIds); + //把scanZeroDetailList中所有元素通过id进行分组 + Map> scanZeroDetailMap = scanZeroDetailList.stream() + .collect(Collectors.groupingBy(TrunklineScanZeroDetailVO::getScanId)); + + unloadPackageList.forEach(unloadPackageVO -> { + Long carsLoadScanId = unloadPackageVO.getCarsLoadScanId(); + List list = scanZeroDetailMap.get(carsLoadScanId); + unloadPackageVO.setScanZeroDetailList(list); + }); + } for (UnloadZeroVO unloadZeroVO : zeroList) { String waybillNo = StringUtil.isBlank(unloadZeroVO.getWaybillNo())?"null":unloadZeroVO.getWaybillNo();