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()));