|
|
@@ -3575,7 +3575,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
List<WaybillOrderNodeVo.WaybillOrderNode> nodeList = Lists.newArrayList();
|
|
|
statusAndTimelineMap.forEach((status, timelines) -> {
|
|
|
WaybillOrderNodeVo.WaybillOrderNode waybillOrderNode = new WaybillOrderNodeVo.WaybillOrderNode();
|
|
|
- if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(timelines)){
|
|
|
+ if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(timelines) && Objects.nonNull(timelines.get(0))){
|
|
|
WaybillOrderNodeVo.Timeline timeline = timelines.get(0);
|
|
|
waybillOrderNode.setId(timeline.getId());
|
|
|
waybillOrderNode.setCreateTime(timeline.getCreateTime());
|