From 77224697be5a65e5eebdbb5fb6726308fbfb82e0 Mon Sep 17 00:00:00 2001 From: xiajunjie <752696511@qq.com> Date: Mon, 27 Dec 2021 20:54:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E5=AD=97=E6=AE=B5=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableService.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) 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 5b4ba4a40a..2e65a0a773 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -456,12 +456,12 @@ public class DataSetTableService { RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class); CurrentUserDto user = AuthUtils.getUser(); userId = user != null ? user.getUserId() : userId; - List roleIds ; - Long deptId ; - if(user != null){ + List roleIds; + Long deptId; + if (user != null) { deptId = user.getDeptId(); roleIds = user.getRoles().stream().map(CurrentRoleDto::getId).collect(Collectors.toList()); - }else { + } else { deptId = authUserService.getUserById(userId).getDeptId(); roleIds = authUserService.roles(userId).stream().map(r -> Long.valueOf(r)).collect(Collectors.toList()); } @@ -491,20 +491,24 @@ public class DataSetTableService { public List getCustomFilters(List fields, DatasetTable datasetTable, Long user) { List customFilter = new ArrayList<>(); - for (DatasetRowPermissions datasetRowPermissions : rowPermissions(datasetTable.getId(), user)){ + for (DatasetRowPermissions datasetRowPermissions : rowPermissions(datasetTable.getId(), user)) { ChartFieldCustomFilterDTO dto = new ChartFieldCustomFilterDTO(); DatasetTableField field = getFieldById(fields, datasetRowPermissions.getDatasetFieldId()); - if(field == null){continue;} + if (field == null) { + continue; + } dto.setField(field); dto.setId(field.getId()); dto.setFilterType(datasetRowPermissions.getFilterType()); - if(datasetRowPermissions.getFilterType().equalsIgnoreCase("logic")){ + if (datasetRowPermissions.getFilterType().equalsIgnoreCase("logic")) { List lists = JSONObject.parseArray(datasetRowPermissions.getFilter(), ChartCustomFilterItemDTO.class); - lists.forEach(chartCustomFilterDTO -> { chartCustomFilterDTO.setFieldId(field.getId()); }); + lists.forEach(chartCustomFilterDTO -> { + chartCustomFilterDTO.setFieldId(field.getId()); + }); dto.setFilter(lists); dto.setLogic(datasetRowPermissions.getLogic()); customFilter.add(dto); - }else { + } else { dto.setEnumCheckField(Arrays.asList(datasetRowPermissions.getEnumCheckField().split(",").clone())); customFilter.add(dto); } @@ -1308,9 +1312,9 @@ public class DataSetTableService { DatasetTableField parentField = dataSetTableFieldsService.get(unionItemDTO.getParentField().getId()); DatasetTableField currentField = dataSetTableFieldsService.get(unionItemDTO.getCurrentField().getId()); - join.append(String.format(keyword, parentTableName)).append(".").append(parentField.getOriginName()) + join.append(String.format(keyword, parentTableName)).append(".").append(String.format(keyword, parentField.getOriginName())) .append(" = ") - .append(String.format(keyword, currentTableName)).append(".").append(currentField.getOriginName()); + .append(String.format(keyword, currentTableName)).append(".").append(String.format(keyword, currentField.getOriginName())); if (i < unionParamDTO.getUnionFields().size() - 1) { join.append(" AND "); }