@@ -2937,7 +2937,7 @@ public class ExportServiceImpl implements ExportService {
//获取乐团信息
this.initMusicGroupInfo(basicOrder, musicGroupNameMap, firstMusicMap, userLastMusicIdMap, userLastMusicNameMap, calenderCooperationMap);
//填充备注信息
- if (basicOrder.getGoodsList() != null) {
+ if (CollectionUtils.isNotEmpty(basicOrder.getGoodsList())) {
String goodsName = basicOrder.getGoodsList().stream().map(Goods::getName).collect(Collectors.joining("|"));
basicOrder.setMemo(goodsName);
}