Merge remote-tracking branch 'origin/dev' into dev

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -245,7 +245,7 @@ public class ChartViewService {
         fields = permissionService.filterColumnPermissons(fields, desensitizationList, datasetTable.getId(), requestList.getUser());
         //将没有权限的列删掉
         List<String> dataeaseNames = fields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList());
-        dataeaseNames.add("count");
+        dataeaseNames.add("*");
         fieldCustomFilter = fieldCustomFilter.stream().filter(item -> !desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
         extStack = extStack.stream().filter(item -> !desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
         extBubble = extBubble.stream().filter(item -> !desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());

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

@@ -56,6 +56,11 @@ public class DirectFieldService implements DataSetFieldService {
         List<String> desensitizationList = new ArrayList<>();
         fields = permissionService.filterColumnPermissons(fields, desensitizationList, datasetTable.getId(), userId);
 
+        //禁用的
+        if(!fields.stream().map(DatasetTableField::getId).collect(Collectors.toList()).contains(fieldId)){
+            return new ArrayList<>();
+        }
+
         if (CollectionUtils.isNotEmpty(desensitizationList) && desensitizationList.contains(field.getDataeaseName())) {
             List<Object> results = new ArrayList<>();
             results.add(ColumnPermissionConstants.Desensitization_desc);