From e35770e5041a9aa93a6f54e6c607c7f45ac9487a Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 6 Jan 2023 17:11:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index d06d88f47f..7afe499902 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -525,6 +525,9 @@ public class ChartViewService { datasourceRequest.setQuery(qp.getSQLAsTmp(sql, xAxis, yAxis, fieldCustomFilter, rowPermissionsTree, extFilterList, view)); } } + List xAxisForRequest = new ArrayList<>(); + xAxisForRequest.addAll(xAxis); xAxisForRequest.addAll(extStack); + datasourceRequest.setXAxis(xAxisForRequest); data = datasourceProvider.getData(datasourceRequest); } else if (table.getMode() == 1) {// 抽取 datasourceRequest.setDatasource(ds); @@ -1039,6 +1042,9 @@ public class ChartViewService { } datasourceRequest.setQuery(querySql); + List xAxisForRequest = new ArrayList<>(); + xAxisForRequest.addAll(xAxis); xAxisForRequest.addAll(extStack); + datasourceRequest.setXAxis(xAxisForRequest); data = datasourceProvider.getData(datasourceRequest); if (CollectionUtils.isNotEmpty(assistFields)) { datasourceAssistRequest.setQuery(assistSQL(datasourceRequest.getQuery(), assistFields));