From 66adc9d34e39d5dce8b4ea4e24cb4c687aba0dcc Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 1 Apr 2025 20:38:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E3=80=90=E5=9B=BE=E8=A1=A8=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=8E=E7=BB=86=E8=A1=A8=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=90=8E=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=20(#15571)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: taojinlong --- .../io/dataease/chart/server/ChartDataServer.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 a1375e1718..002fde41e5 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 @@ -518,12 +518,11 @@ public class ChartDataServer implements ChartDataApi { cell.setCellStyle(cellStyle); cell.setCellValue(getDeFieldName(xAxis, column.getKey())); } else { - Cell cell1 = rowMap.get("row" + depth).createCell(width); - cell1.setCellValue(getDeFieldName(xAxis, column.getKey())); - cell1.setCellStyle(cellStyle); - Cell cell2 = rowMap.get("row" + toDepth).createCell(width); - cell2.setCellValue(getDeFieldName(xAxis, column.getKey())); - cell2.setCellStyle(cellStyle); + for (int i = depth; i <= toDepth; i++) { + Cell cell1 = rowMap.get("row" + i).createCell(width); + cell1.setCellValue(getDeFieldName(xAxis, column.getKey())); + cell1.setCellStyle(cellStyle); + } CellRangeAddress region = new CellRangeAddress(depth, toDepth, width, width); sheet.addMergedRegion(region);