Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -2690,6 +2690,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			records.forEach(item -> {
 				Long scanId = item.getCarsLoadScanId();
 				List<TrunklineScanZeroDetailVO> list = scanZeroDetailVOMap.get(scanId);
+				if(CollUtil.isNotEmpty(list)){
 					//把list中所有元素的goodsName用逗号拼起来
 					String loadingGoods = list.stream()
 						.map(t-> t.getGoodsName()+"("+t.getLoadingNum()+")")
@@ -2700,6 +2701,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						.collect(Collectors.joining(","));
 					item.setLoadingGoods(loadingGoods);
 					item.setUnloadGoods(unloadGoods);
+				}
 			});
 		}
 		pageList.setRecords(records);