From 462da267a4973dacff89a96ef41545a3d89ab459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?=
 <42510293+ziyujiahao@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:31:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=20(#1719?=
 =?UTF-8?q?0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/chart/manage/ChartDataManage.java | 10 ++++++----
 .../src/components/visualization/ComponentEditBar.vue  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
index e8b7ddd46d..ff50c41dc6 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
@@ -227,10 +227,12 @@ public class ChartDataManage {
         // 联动条件
         if (ObjectUtils.isNotEmpty(chartExtRequest.getLinkageFilters())) {
             for (ChartExtFilterDTO linkageFilter : chartExtRequest.getLinkageFilters()) {
-                if (3 == linkageFilter.getFilterType()) {
-                    customLinkageFilter = linkageFilter.getCustomFilter();
-                } else {
-                    filters.add(linkageFilter);
+                if(linkageFilter != null){
+                    if (3 == linkageFilter.getFilterType()) {
+                        customLinkageFilter = linkageFilter.getCustomFilter();
+                    } else {
+                        filters.add(linkageFilter);
+                    }
                 }
             }
         }
diff --git a/core/core-frontend/src/components/visualization/ComponentEditBar.vue b/core/core-frontend/src/components/visualization/ComponentEditBar.vue
index db14310319..bfb3307cc6 100644
--- a/core/core-frontend/src/components/visualization/ComponentEditBar.vue
+++ b/core/core-frontend/src/components/visualization/ComponentEditBar.vue
@@ -563,7 +563,7 @@ const linkageChange = item => {
   let checkResult = false
   if (item.linkageFilters && item.linkageFilters.length > 0) {
     item.linkageFilters.forEach(linkage => {
-      if (element.value.id === linkage.sourceViewId) {
+      if (element.value.id === linkage?.sourceViewId) {
         checkResult = true
       }
     })