dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6523 from dataease/pr@dev@fix_symbol_map

Browse Source 
fix: 符号地图报错
This commit is contained in:
fit2cloud-chenyw 2023-11-03 10:56:20 +08:00 committed by GitHub
commit c9c52642f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
View File

@ -1069,30 +1069,18 @@ public class ChartDataBuild {
// 表格
public static Map<String, Object> transTableNormal(Map<String, List<ChartViewFieldDTO>> fieldMap, ChartViewWithBLOBs view, List<String[]> data, Map<String, ColumnPermissionItem> desensitizationList) {
String[] keys = new String[]{"labelAxis", "tooltipAxis"};
List<ChartViewFieldDTO> fields = new ArrayList<>();
List<ChartViewFieldDTO> yfields = new ArrayList<>();
if (CollectionUtils.isNotEmpty(fieldMap.get("xAxis"))) fields.addAll(fieldMap.get("xAxis"));
if (CollectionUtils.isNotEmpty(fieldMap.get("tooltipAxis"))) {
fieldMap.get("tooltipAxis").forEach(field -> {
Integer deType = field.getDeType();
if (deType == 2 || deType == 3) {
yfields.add(field);
} else {
fields.add(field);
}
});
}
if (CollectionUtils.isNotEmpty(fieldMap.get("labelAxis"))) {
fieldMap.get("labelAxis").forEach(field -> {
Integer deType = field.getDeType();
if (deType == 2 || deType == 3) {
yfields.add(field);
} else {
fields.add(field);
}
});
for (Map.Entry<String, List<ChartViewFieldDTO>> entry : fieldMap.entrySet()) {
if (StringUtils.equalsAny(entry.getKey(), keys)) {
fields.addAll(entry.getValue());
}
}
if (CollectionUtils.isNotEmpty(fieldMap.get("yAxis"))) fields.addAll(fieldMap.get("yAxis"));
if (CollectionUtils.isNotEmpty(yfields)) fields.addAll(yfields);
return transTableNormal(fields, view, data, desensitizationList);