From 2e344152b640726441a06866e29b3ee69a8ea1d8 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Fri, 7 Mar 2025 10:41:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A0=86=E5=8F=A0=E6=8A=98=E7=BA=BF=E5=9B=BE=E5=9C=A8=E4=B8=8D?=
 =?UTF-8?q?=E6=8B=96=E5=85=A5=E5=A0=86=E5=8F=A0=E5=AD=97=E6=AE=B5=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E7=B4=AF=E5=8A=A0=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/chart/charts/impl/DefaultChartHandler.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
index 7b1af9fc95..358e437bc1 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
@@ -525,7 +525,9 @@ public class DefaultChartHandler extends AbstractChartPlugin {
                     if (CollectionUtils.isEmpty(data)) {
                         break;
                     }
-                    if (StringUtils.containsAny(chartType, "group", "stack")) {
+                    boolean isStack = StringUtils.containsIgnoreCase(chartType, "stack") && !extStack.isEmpty();
+                    boolean isGroup = StringUtils.containsIgnoreCase(chartType, "group") && !xAxisExt.isEmpty();
+                    if (isStack || isGroup) {
                         if (CollectionUtils.isEmpty(xAxis)) {
                             break;
                         }