diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java index 68ded802c..7f97af235 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java @@ -519,6 +519,9 @@ public class DimensionServiceImpl extends ServiceImpl dimensionDOS, EventType eventType) { List dataItems = - dimensionDOS.stream().map(this::getDataItem).collect(Collectors.toList()); + dimensionDOS.stream().map(this::getDataItem) + .filter(Objects::nonNull) + .collect(Collectors.toList()); return new DataEvent(this, dataItems, eventType); } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java index 390d4c63f..823849fb6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java @@ -683,7 +683,9 @@ public class MetricServiceImpl extends ServiceImpl private DataEvent getDataEvent(List metricDOS, EventType eventType) { List dataItems = - metricDOS.stream().map(this::getDataItem).collect(Collectors.toList()); + metricDOS.stream().map(this::getDataItem) + .filter(Objects::nonNull) + .collect(Collectors.toList()); return new DataEvent(this, dataItems, eventType); }