From 18d398c5b175d6644c20f93f89a1fab40f5bef04 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Tue, 19 May 2026 19:03:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8C=87=E6=A0=87=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAExcel=E8=A1=A8=E6=A0=BC=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=90=8E=E7=9A=84=E7=BB=B4=E5=BA=A6=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=95=B0=E6=8D=AE=E4=BC=9A=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=20#18367?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/chart/server/ChartDataServer.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
index ead8e48321..ffbbfb9736 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
@@ -381,10 +381,8 @@ public class ChartDataServer implements ChartDataApi {
         Integer totalDepth = 0;
         List<CellRangeAddress> mergeConfig = new ArrayList<>();
         if (StringUtils.equalsAnyIgnoreCase(viewInfo.getType(), "table-normal", "table-info")) {
+            exportFields = exportFields.stream().filter(tmpAxis -> !tmpAxis.isHide()).toList();
             for (ChartViewFieldDTO tmpAxis : exportFields) {
-                if (tmpAxis.isHide()) {
-                    continue;
-                }
                 if (tmpAxis.getDeType().equals(DeTypeConstants.DE_INT) || tmpAxis.getDeType().equals(DeTypeConstants.DE_FLOAT)) {
                     CellStyle formatterCellStyle = createCellStyle(wb, tmpAxis.getFormatterCfg(), null);
                     styles.add(formatterCellStyle);
@@ -398,7 +396,7 @@ public class ChartDataServer implements ChartDataApi {
             if (tableHeaderMap.get("headerGroup") != null && Boolean.parseBoolean(tableHeaderMap.get("headerGroup").toString())) {
                 var tmpHeader = JsonUtil.parseObject((String) JsonUtil.toJSONString(customAttr.get("tableHeader")), TableHeader.class);
                 // 校验字段数量和顺序
-                var allAxis = new ArrayList<>(exportFields.stream().filter(x -> !x.isHide()).toList());
+                var allAxis = new ArrayList<>(exportFields);
                 if (validateHeaderGroup(tmpHeader, allAxis)) {
                     tableHeader = tmpHeader;
                     for (TableHeader.ColumnInfo column : tableHeader.getHeaderGroupConfig().getColumns()) {