From 6c5a781c7f328fcac29fe587376732b3ab23fb36 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 18 Jun 2024 12:48:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=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 --- .../java/io/dataease/service/chart/ChartViewService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 23e2fcae30..0223656212 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -1167,12 +1167,12 @@ public class ChartViewService { 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)) { @@ -1742,15 +1742,14 @@ public class ChartViewService { 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]); } - logger.info("data compare:" + x1 + "---" + x2 + "-----" + StringUtils.equals(x1, x2)); if (StringUtils.equals(x1, x2)) { resultData.add(res1); break;