center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #4864 from dataease/pr@dev@fix_chart_drill_npe

Browse Source 
fix(视图-下钻): 修复维度含有空值时下钻异常
This commit is contained in:
wisonic-s 2023-03-23 17:32:38 +08:00 committed by GitHub
commit 411c67993b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -879,10 +879,11 @@ public class ChartViewService {
fieldsToFilter.addAll(xAxisBase);
}
ChartDrillRequest head = drillRequestList.get(0);
Map<String, String> dimValMap = head.getDimensionList().stream().collect(Collectors.toMap(ChartDimensionDTO::getId, ChartDimensionDTO::getValue, ((p, n) -> p)));
Map<String, ChartViewFieldDTO> fieldMap = Stream.of(xAxisBase, xAxisExt, extStack).
flatMap(Collection::stream).
collect(Collectors.toMap(ChartViewFieldDTO::getId, o -> o, ((p, n) -> p)));
Map<String, String> dimValMap = new HashMap<>();
head.getDimensionList().forEach(item -> dimValMap.put(item.getId(), item.getValue()));
Map<String, ChartViewFieldDTO> 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);