From ce4cdb62ab906bee2f7c4f12211c67b1b83f0431 Mon Sep 17 00:00:00 2001
From: wangyong97 <wangyong97@meituan.com>
Date: Thu, 14 Aug 2025 19:15:07 +0800
Subject: [PATCH] =?UTF-8?q?(fix)(headless)=E4=BF=AE=E5=A4=8D=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E5=92=8C=E6=8C=87=E6=A0=87=E4=BF=A1=E6=81=AF=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=97=B6=EF=BC=8C=E9=81=8D=E5=8E=86List<NULL?=
 =?UTF-8?q?>=E6=95=B0=E6=8D=AE=E6=8A=9B=E5=87=BANPE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../headless/server/service/impl/DimensionServiceImpl.java | 7 ++++++-
 .../headless/server/service/impl/MetricServiceImpl.java    | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

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<DimensionDOMapper, Dimensi
 
     private DataItem getDataItem(DimensionDO dimensionDO) {
         ModelResp modelResp = modelService.getModel(dimensionDO.getModelId());
+        if(modelResp == null) {
+            return null;
+        }
         DimensionResp dimensionResp = DimensionConverter.convert2DimensionResp(dimensionDO,
                 ImmutableMap.of(modelResp.getId(), modelResp));
         return DataItem.builder().id(dimensionResp.getId().toString()).name(dimensionResp.getName())
@@ -528,7 +531,9 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
 
     private DataEvent getDataEvent(List<DimensionDO> dimensionDOS, EventType eventType) {
         List<DataItem> 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<MetricDOMapper, MetricDO>
 
     private DataEvent getDataEvent(List<MetricDO> metricDOS, EventType eventType) {
         List<DataItem> 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);
     }