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

Merge pull request #2372 from dataease/dev

Browse Source 
Dev
This commit is contained in:
王嘉豪 2022-06-01 16:41:23 +08:00 committed by GitHub
commit d511f7ad34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/ext/ExtPanelViewMapper.xml
View File

@ -44,7 +44,7 @@
panel_view
LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id
left join dataset_table_field on chart_view.table_id = dataset_table_field.table_id
where panel_view.panel_id =#{panelId}
where panel_view.panel_id =#{panelId} and chart_view.id is not null
</select>
<select id="groups" resultMap="treeNodeMap">

2
backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
View File

@ -76,7 +76,7 @@ public class DirectFieldService implements DataSetFieldService {
fields = permissionService.filterColumnPermissons(fields, desensitizationList, datasetTable.getId(), userId);
Map<String, DatasetTableField> fieldMap = fields.stream().collect(Collectors.toMap(DatasetTableField::getId, node -> node));
permissionFields = fieldIds.stream().map(fieldMap::get).collect(Collectors.toList());
if (CollectionUtils.isEmpty(permissionFields)) {
if (CollectionUtils.isEmpty(permissionFields) || permissionFields.get(0) == null) {
return new ArrayList<>();
}
if (CollectionUtils.isNotEmpty(desensitizationList) && desensitizationList.contains(field.getDataeaseName())) {