From c0c7bf5a77cfd2cd5f5dba258ef96e25e58e3fa3 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 10 Apr 2024 11:29:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8D=95=E4=B8=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E7=9A=84=E6=95=B0=E6=8D=AE=E9=9B=86=E3=80=81?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E4=BD=BF=E7=94=A8=E5=AF=B9=E5=BA=94=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=AF=AD=E6=B3=95=E5=92=8C=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/chart/manage/ChartDataManage.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index 634388575c..290b691398 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -528,9 +528,9 @@ public class ChartDataManage { querySql = originSql + limit; totalPageSql = "SELECT COUNT(*) FROM (" + originSql + ") COUNT_TEMP"; } else if (StringUtils.containsIgnoreCase(view.getType(), "quadrant")) { - Dimension2SQLObj.dimension2sqlObj(sqlMeta, xAxis, transFields(allFields)); + Dimension2SQLObj.dimension2sqlObj(sqlMeta, xAxis, transFields(allFields), crossDs, dsMap); yAxis.addAll(extBubble); - Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, transFields(allFields)); + Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, transFields(allFields), crossDs, dsMap); querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view); if (containDetailField(view) && ObjectUtils.isNotEmpty(viewFields)) { detailFieldList.addAll(xAxis); @@ -549,7 +549,7 @@ public class ChartDataManage { detailFieldList.addAll(xAxis); detailFieldList.addAll(viewFields); - Dimension2SQLObj.dimension2sqlObj(sqlMeta, detailFieldList, transFields(allFields)); + Dimension2SQLObj.dimension2sqlObj(sqlMeta, detailFieldList, transFields(allFields), crossDs, dsMap); String originSql = SQLProvider.createQuerySQL(sqlMeta, false, needOrder, view); String limit = ((pageInfo.getGoPage() != null && pageInfo.getPageSize() != null) ? " LIMIT " + pageInfo.getPageSize() + " OFFSET " + (pageInfo.getGoPage() - 1) * pageInfo.getPageSize() : ""); detailFieldSql = originSql + limit;