From 7daa427792c35caf94a1de150199f8e4d0cdfe9d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 4 Aug 2025 18:36:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[Bug]2.10.11=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=A1=A8=E5=A4=B4=E7=BC=BA=E5=A4=B1=20#16497?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/chart/server/ChartDataServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cb6bfbc97e..8605ec7695 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 @@ -274,7 +274,7 @@ public class ChartDataServer implements ChartDataApi { xAxis.addAll(request.getViewInfo().getXAxisExt()); xAxis.addAll(request.getViewInfo().getYAxisExt()); xAxis.addAll(request.getViewInfo().getExtStack()); - header = Arrays.stream(request.getHeader()).filter(item -> xAxis.stream().map(DatasetTableFieldDTO::getName).collect(Collectors.toList()).contains(item)).collect(Collectors.toList()).toArray(); + header = Arrays.stream(request.getHeader()).filter(item -> xAxis.stream().map(d -> StringUtils.isNotBlank(d.getChartShowName()) ? d.getChartShowName() : d.getName()).toList().contains(item)).collect(Collectors.toList()).toArray(); details.add(0, header); ViewDetailField[] detailFields = request.getDetailFields(); ChartDataServer.setExcelData(detailsSheet, cellStyle, header, details, detailFields, excelTypes, request.getViewInfo(), wb);