chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决发现问题。

This commit is contained in:
chenxudong 2025-03-17 14:38:25 +08:00
parent 6697cbdfcb
commit 1b71543cb6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -295,6 +295,9 @@ public class CommonService {
// 如果是数据库界面查询，此处需要进行权限筛选 // 如果是数据库界面查询，此处需要进行权限筛选
if (querySource == PrjQuerySource.SYS_DB.value) { if (querySource == PrjQuerySource.SYS_DB.value) {
if (CollUtil.isEmpty(accessibleIds)) {
return map;
}
queryWrapper.in(EdFileInfo::getId, accessibleIds); queryWrapper.in(EdFileInfo::getId, accessibleIds);
} }
List<String> prjIds = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList()); List<String> prjIds = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList());
@ -499,17 +502,18 @@ public class CommonService {
List<String> prjInfo; List<String> prjInfo;
if (dataOwnCode == DataOwnEnum.SYS_FILE.code) { if (dataOwnCode == DataOwnEnum.SYS_FILE.code) {
prjInfo = querySysPrjTree(PrjQuerySource.SYS_DB.value, null, new FileProjectVO()).get(PrjQuerySource.SYS_DB.value); prjInfo = querySysPrjTree(PrjQuerySource.SYS_DB.value, null, new FileProjectVO()).getOrDefault(PrjQuerySource.SYS_DB.value, new ArrayList<>());
} else if (dataOwnCode == DataOwnEnum.USER_FILE.code) { } else if (dataOwnCode == DataOwnEnum.USER_FILE.code) {
prjInfo = queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).get(PrjQuerySource.USER_DB.value); prjInfo = queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).getOrDefault(PrjQuerySource.USER_DB.value, new ArrayList<>());
} else { } else {
prjInfo = queryRepoPrjTree(PrjQuerySource.REPO_DB.value, new FileProjectVO()).get(PrjQuerySource.REPO_DB.value); prjInfo = queryRepoPrjTree(PrjQuerySource.REPO_DB.value, new FileProjectVO()).getOrDefault(PrjQuerySource.REPO_DB.value, new ArrayList<>());
} }
prjInfo.forEach(e -> {
FileProjectVO projectVO = JSONUtil.toList(e, FileProjectVO.class).get(0); for (String info : prjInfo) {
FileProjectVO projectVO = JSONUtil.toList(info, FileProjectVO.class).get(0);
Set<String> leafIds = getLeafNodes(projectVO).stream().map(FileProjectVO::getCategoryId).collect(Collectors.toSet()); Set<String> leafIds = getLeafNodes(projectVO).stream().map(FileProjectVO::getCategoryId).collect(Collectors.toSet());
res.addAll(leafIds); res.addAll(leafIds);
}); }
return res; return res;
} }