提交 d5c0a625 authored 作者: junjun's avatar junjun

fix: 修复视图中数据集字段、数据,未受数据集权限控制的问题

上级 034d12c6
...@@ -405,7 +405,7 @@ public class DataSetTableService { ...@@ -405,7 +405,7 @@ public class DataSetTableService {
public DataSetTableDTO getWithPermission(String id, Long user) { public DataSetTableDTO getWithPermission(String id, Long user) {
CurrentUserDto currentUserDto = AuthUtils.getUser(); CurrentUserDto currentUserDto = AuthUtils.getUser();
Long userId = user != null ? currentUserDto.getUserId() : user; Long userId = user != null ? user : currentUserDto.getUserId();
DataSetTableRequest dataSetTableRequest = new DataSetTableRequest(); DataSetTableRequest dataSetTableRequest = new DataSetTableRequest();
dataSetTableRequest.setId(id); dataSetTableRequest.setId(id);
...@@ -1703,10 +1703,10 @@ public class DataSetTableService { ...@@ -1703,10 +1703,10 @@ public class DataSetTableService {
if (datasetTableIncrementalConfig == null || StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())) { if (datasetTableIncrementalConfig == null || StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())) {
return; return;
} }
if(StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd())){ if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd())) {
datasetTableIncrementalConfig.setIncrementalAdd(datasetTableIncrementalConfig.getIncrementalAdd().trim()); datasetTableIncrementalConfig.setIncrementalAdd(datasetTableIncrementalConfig.getIncrementalAdd().trim());
} }
if(StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete())){ if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete())) {
datasetTableIncrementalConfig.setIncrementalDelete(datasetTableIncrementalConfig.getIncrementalDelete().trim()); datasetTableIncrementalConfig.setIncrementalDelete(datasetTableIncrementalConfig.getIncrementalDelete().trim());
} }
if (StringUtils.isEmpty(datasetTableIncrementalConfig.getId())) { if (StringUtils.isEmpty(datasetTableIncrementalConfig.getId())) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论