From 8f2cd2218eda65bd55cf6265f069dca5a2eb1afe Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 23 Mar 2023 17:17:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E4=B8=8B=E9=92=BB):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=B4=E5=BA=A6=E5=90=AB=E6=9C=89=E7=A9=BA?= =?UTF-8?q?=E5=80=BC=E6=97=B6=E4=B8=8B=E9=92=BB=E5=BC=82=E5=B8=B8?= 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, 5 insertions(+), 4 deletions(-) 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 1086995a1a..1af4e7036a 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -879,10 +879,11 @@ public class ChartViewService { fieldsToFilter.addAll(xAxisBase); } ChartDrillRequest head = drillRequestList.get(0); - Map dimValMap = head.getDimensionList().stream().collect(Collectors.toMap(ChartDimensionDTO::getId, ChartDimensionDTO::getValue, ((p, n) -> p))); - Map fieldMap = Stream.of(xAxisBase, xAxisExt, extStack). - flatMap(Collection::stream). - collect(Collectors.toMap(ChartViewFieldDTO::getId, o -> o, ((p, n) -> p))); + Map dimValMap = new HashMap<>(); + head.getDimensionList().forEach(item -> dimValMap.put(item.getId(), item.getValue())); + Map fieldMap = Stream.of(xAxisBase, xAxisExt, extStack) + .flatMap(Collection::stream) + .collect(Collectors.toMap(ChartViewFieldDTO::getId, o -> o, ((p, n) -> p))); for (int i = 0; i < drillRequestList.size(); i++) { ChartDrillRequest request = drillRequestList.get(i); ChartViewFieldDTO chartViewFieldDTO = drill.get(i);