From 3c014f79f672c9b74799fd325799349295b5ab54 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 2 Jul 2024 19:53:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E5=A0=86=E5=8F=A0?=
 =?UTF-8?q?=E5=9B=BE=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 e5afb313c3..3c13d42bf7 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
@@ -128,6 +128,9 @@ public class DefaultChartHandler extends AbstractChartPlugin {
         var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
         // 如果是表格导出查询 则在此处直接就可以返回
         var extStack = formatResult.getAxisMap().get(ChartAxis.extStack);
+        if (CollectionUtils.isNotEmpty(extStack) && xAxis.size() > extStack.size()) {
+            xAxis = xAxis.subList(0, xAxis.size() - extStack.size());
+        }
         if (view.getIsExcelExport()) {
             Map<String, Object> sourceInfo = ChartDataBuild.transTableNormal(xAxis, yAxis, view, calcResult.getOriginData(), extStack, desensitizationList);
             sourceInfo.put("sourceData", calcResult.getOriginData());