From 7914ad780869fd8089b973cd93ebf768b9c75e11 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 18 Jun 2024 13:42:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=90=8C=E7=8E=AF=E6=AF=94=E6=97=A5=E6=9C=9F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?= 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 de276c7c17..e7b721bb3a 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 @@ -750,7 +750,7 @@ public class ChartDataManage { yAxis.addAll(yFields); Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, transFields(allFields), crossDs, dsMap); querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view); - List xAxisIds = xAxis.stream().map(ChartViewFieldDTO::getId).toList(); + List xAxisIds = xAxis.stream().map(ChartViewFieldDTO::getId).toList(); viewFields.addAll(xAxis); viewFields.addAll(allFields.stream().filter(field -> !xAxisIds.contains(field.getId())).toList()); if (ObjectUtils.isNotEmpty(viewFields)) { @@ -944,12 +944,12 @@ public class ChartDataManage { List resultData = new ArrayList<>(); for (String[] res1 : data) { StringBuilder x1 = new StringBuilder(); - for (int i = 0; i < xAxis.size() + xAxisExt.size(); i++) { + for (int i = 0; i < xAxis.size(); i++) { x1.append(res1[i]); } for (String[] res2 : yoyData) { StringBuilder x2 = new StringBuilder(); - for (int i = 0; i < xAxis.size() + xAxisExt.size(); i++) { + for (int i = 0; i < xAxis.size(); i++) { x2.append(res2[i]); } if (StringUtils.equals(x1, x2)) {