From 0d866bcefd41fa4402332b83dcb5d7307be09b62 Mon Sep 17 00:00:00 2001 From: wisonic Date: Mon, 18 Aug 2025 16:36:12 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=85=A8=E9=83=BD?= =?UTF-8?q?=E6=98=AF=E7=BB=B4=E5=BA=A6=E6=97=B6=E5=AF=BC=E5=87=BA=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/chart/server/ChartDataServer.java | 8 ++++---- 1 file changed, 4 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 330d70a742..98f1b8f144 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 @@ -380,15 +380,15 @@ public class ChartDataServer implements ChartDataApi { Map tableCell = (Map) viewInfo.getCustomAttr().get("tableCell"); Boolean mergeCells = (Boolean) tableCell.get("mergeCells"); if (mergeCells != null && mergeCells) { - var quotaIndex = 0; + var mergeIndex = viewInfo.getXAxis().size(); for (int i = 0; i < viewInfo.getXAxis().size(); i++) { if ("q".equalsIgnoreCase(viewInfo.getXAxis().get(i).getGroupType())) { - quotaIndex = i; + mergeIndex = i; break; } } - if (quotaIndex >= 1 && details.size() > 1) { - mergeConfig = getMergeConfig(details.subList(1, details.size()), quotaIndex - 1, totalDepth == 0 ? 1 : totalDepth); + if (mergeIndex >= 1 && details.size() > 1) { + mergeConfig = getMergeConfig(details.subList(1, details.size()), mergeIndex - 1, totalDepth == 0 ? 1 : totalDepth); } } }