center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #1336 from dataease/pr@dev@fix_auth_tree

Browse Source 
feat(权限): 统一授权数据集tree
This commit is contained in:
XiaJunjie2020 2021-11-30 16:31:24 +08:00 committed by GitHub
commit 83f69f0804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java
View File

@ -27,14 +27,16 @@ public class VAuthModelService {
public List<VAuthModelDTO> queryAuthModel(VAuthModelRequest request) { public List<VAuthModelDTO> queryAuthModel(VAuthModelRequest request) {
request.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); request.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
List<VAuthModelDTO> result = extVAuthModelMapper.queryAuthModel(request); List<VAuthModelDTO> result = extVAuthModelMapper.queryAuthModel(request);
// 定时任务选数据集时，列表需去除空目录
if (request.isClearEmptyDir()) {
result = filterData(request, result); result = filterData(request, result);
List<VAuthModelDTO> vAuthModelDTOS = TreeUtils.mergeTree(result); List<VAuthModelDTO> vAuthModelDTOS = TreeUtils.mergeTree(result);
if (request.isClearEmptyDir()) {
setAllLeafs(vAuthModelDTOS); setAllLeafs(vAuthModelDTOS);
removeEmptyDir(vAuthModelDTOS); removeEmptyDir(vAuthModelDTOS);
}
return vAuthModelDTOS; return vAuthModelDTOS;
} }
return TreeUtils.mergeTree(result);
}
private List<VAuthModelDTO> filterData(VAuthModelRequest request, List<VAuthModelDTO> result) { private List<VAuthModelDTO> filterData(VAuthModelRequest request, List<VAuthModelDTO> result) {
if (request.getDatasetMode() != null && request.getDatasetMode() == 1) { if (request.getDatasetMode() != null && request.getDatasetMode() == 1) {