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

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

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