diff --git a/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java b/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java index 616c9d14e9..9d8e8f3345 100644 --- a/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java +++ b/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java @@ -90,7 +90,7 @@ public class DePermissionAnnotationHandler { } catch (Throwable throwable) { LogUtil.error(throwable.getMessage(), throwable); - throw new RuntimeException(throwable); + throw new RuntimeException(throwable.getMessage()); } } diff --git a/backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java b/backend/src/main/java/io/dataease/controller/request/datasource/es/Request.java similarity index 89% rename from backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java rename to backend/src/main/java/io/dataease/controller/request/datasource/es/Request.java index f69c4290cc..b66102e581 100644 --- a/backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java +++ b/backend/src/main/java/io/dataease/controller/request/datasource/es/Request.java @@ -3,7 +3,7 @@ package io.dataease.controller.request.datasource.es; import lombok.Data; @Data -public class Requst { +public class Request { private String query; private Integer fetch_size = 10000; private boolean field_multi_value_leniency = true; diff --git a/backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java b/backend/src/main/java/io/dataease/controller/request/datasource/es/RequestWithCursor.java similarity index 69% rename from backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java rename to backend/src/main/java/io/dataease/controller/request/datasource/es/RequestWithCursor.java index eebd503d5d..9da1be5145 100644 --- a/backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java +++ b/backend/src/main/java/io/dataease/controller/request/datasource/es/RequestWithCursor.java @@ -3,6 +3,6 @@ package io.dataease.controller.request.datasource.es; import lombok.Data; @Data -public class RequstWithCursor extends Requst{ +public class RequestWithCursor extends Request { private String cursor; } diff --git a/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java b/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java index eb055a45b4..7b88b14edf 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java @@ -5,16 +5,14 @@ import com.google.gson.Gson; import io.dataease.commons.utils.HttpClientConfig; import io.dataease.commons.utils.HttpClientUtil; import io.dataease.controller.request.datasource.es.EsReponse; -import io.dataease.controller.request.datasource.es.Requst; -import io.dataease.controller.request.datasource.es.RequstWithCursor; +import io.dataease.controller.request.datasource.es.Request; +import io.dataease.controller.request.datasource.es.RequestWithCursor; import io.dataease.controller.request.datasource.DatasourceRequest; import io.dataease.dto.datasource.EsConfiguration; import io.dataease.dto.datasource.TableDesc; import io.dataease.dto.datasource.TableField; import io.dataease.exception.DataEaseException; import io.dataease.i18n.Translator; -import io.dataease.provider.ProviderFactory; -import io.dataease.provider.query.QueryProvider; import io.dataease.provider.query.es.EsQueryProvider; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; @@ -55,11 +53,11 @@ public class EsProvider extends DatasourceProvider { byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8)); httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); } - Requst requst = new Requst(); - requst.setQuery(dsr.getQuery()); - requst.setFetch_size(dsr.getFetchSize()); + Request request = new Request(); + request.setQuery(dsr.getQuery()); + request.setFetch_size(dsr.getFetchSize()); String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + esConfiguration.getUri() + "?format=json" : esConfiguration.getUrl() + "/" + esConfiguration.getUri() + "?format=json"; - String response = HttpClientUtil.post(url, new Gson().toJson(requst), httpClientConfig); + String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig); EsReponse esReponse = new Gson().fromJson(response, EsReponse.class); list.addAll(fetchResult(esReponse)); @@ -69,7 +67,7 @@ public class EsProvider extends DatasourceProvider { } if (!dsr.isPreviewData()) { while (StringUtils.isNotEmpty(esReponse.getCursor())) { - RequstWithCursor requstWithCursor = new RequstWithCursor(); + RequestWithCursor requstWithCursor = new RequestWithCursor(); requstWithCursor.setQuery(dsr.getQuery()); requstWithCursor.setFetch_size(dsr.getFetchSize()); requstWithCursor.setCursor(esReponse.getCursor()); @@ -286,11 +284,11 @@ public class EsProvider extends DatasourceProvider { httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); } - Requst requst = new Requst(); - requst.setQuery(sql); - requst.setFetch_size(datasourceRequest.getFetchSize()); + Request request = new Request(); + request.setQuery(sql); + request.setFetch_size(datasourceRequest.getFetchSize()); String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + uri : esConfiguration.getUrl() + "/" + uri; - String response = HttpClientUtil.post(url, new Gson().toJson(requst), httpClientConfig); + String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig); return response; } diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 828c206dc3..354758577e 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -264,7 +264,7 @@ public class ChartViewService { //行权限 - List rowPermissionFields = permissionService.getCustomFilters(columnPermissionFields, table, requestList.getUser()); + List rowPermissionFields = permissionService.getCustomFilters(fields, table, requestList.getUser()); fieldCustomFilter.addAll(rowPermissionFields); for (ChartFieldCustomFilterDTO ele : fieldCustomFilter) { diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 4d95d8f4bf..2bb39fd550 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -479,6 +479,8 @@ public class DataSetTableService { return map; } DatasetTable datasetTable = datasetTableMapper.selectByPrimaryKey(dataSetTableRequest.getId()); + // 行权限 + List customFilter = permissionService.getCustomFilters(fields, datasetTable, null); // 列权限 List desensitizationList = new ArrayList<>(); fields = permissionService.filterColumnPermissons(fields, desensitizationList, datasetTable.getId(), null); @@ -488,8 +490,7 @@ public class DataSetTableService { map.put("page", new DataSetPreviewPage()); return map; } - // 行权限 - List customFilter = permissionService.getCustomFilters(fields, datasetTable, null); + String[] fieldArray = fields.stream().map(DatasetTableField::getDataeaseName).toArray(String[]::new); DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class); diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 9dd167f33b..cd97d64708 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -160,7 +160,7 @@