From d790a02a41f4558031e2e5405b45131cbdb5fa14 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Wed, 3 Jul 2024 16:39:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E5=B8=A6=E5=AD=90?= =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E7=9A=84=E5=9B=BE=E8=A1=A8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=B4=E5=BA=A6=E4=B8=8B=E9=92=BB=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/charts/impl/DefaultChartHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java index 0097dac8e1..e889d79a3b 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java @@ -484,7 +484,7 @@ public class DefaultChartHandler extends AbstractChartPlugin { List drillFields, List drillRequestList) { var fields = xAxis.stream().map(ChartViewFieldDTO::getId).collect(Collectors.toSet()); - ChartDrillRequest head = drillRequestList.get(0); + ChartDrillRequest head = drillRequestList.getFirst(); Map dimValMap = new HashMap<>(); head.getDimensionList().forEach(item -> dimValMap.put(item.getId(), item.getValue())); Map fieldMap = xAxis.stream().collect(Collectors.toMap(ChartViewFieldDTO::getId, o -> o, ((p, n) -> p))); @@ -525,6 +525,7 @@ public class DefaultChartHandler extends AbstractChartPlugin { tmpFilter.setFieldId(String.valueOf(tmpField.getId())); tmpFilter.setFilterType(1); if (datasetTableField.getDeType() == 1) { + tmpFilter.setOriginValue(Collections.singletonList(dimValMap.get(tmpField.getId()))); tmpFilter.setOperator("between"); // 把value类似过滤组件处理，获得start time和end time Map stringLongMap = Utils.parseDateTimeValue(dimValMap.get(tmpField.getId()));