Merge pull request #2372 from dataease/dev

backend/src/main/java/io/dataease/ext/ExtPanelViewMapper.xml

@@ -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">

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

@@ -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())) {