From bb0b2b63eb536db8cf9001d66d1b145c18dfbc74 Mon Sep 17 00:00:00 2001
From: wisonic-s <51065359+wisonic-s@users.noreply.github.com>
Date: Thu, 13 Mar 2025 21:21:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=80=8F=E8=A7=86=E8=A1=A8=E8=87=AA=E5=AE=9A=E4=B9=89=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E5=88=97=E6=80=BB=E8=AE=A1=E4=B8=AD=E7=9A=84=E8=A1=8C?=
 =?UTF-8?q?=E5=B0=8F=E8=AE=A1=E4=B8=8D=E6=98=BE=E7=A4=BA=20(#15348)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/chart/charts/impl/table/TablePivotHandler.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java
index 75b4680ca3..fcc56fc89d 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TablePivotHandler.java
@@ -208,8 +208,8 @@ public class TablePivotHandler extends GroupChartHandler {
             }
         }
         // 列总计里面的行小计
-        if (col.isShowGrandTotals() && row.isShowGrandTotals() && rowAxis.size() >= 2) {
-            var yAxis = getCustomFields(view, row.getCalcTotals().getCfg());
+        if (col.isShowGrandTotals() && row.isShowSubTotals() && rowAxis.size() >= 2) {
+            var yAxis = getCustomFields(view, row.getCalcSubTotals().getCfg());
             if (!yAxis.isEmpty()) {
                 var tmpData = new ArrayList<Map<String, Object>>();
                 dataMap.put("rowSubInColTotal", tmpData);