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

修改项目数据发布管理的bug

This commit is contained in:
chenxudong 2025-03-25 10:57:43 +08:00
parent 5d4e70206b
commit 7e96ca171e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -493,13 +493,13 @@ public class CommonService {
return edFileInfoMapper.selectById(prjId).getFileName(); return edFileInfoMapper.selectById(prjId).getFileName();
} }
public Set<String> selectPrjLeafs(int dataOwnCode) { public Set<String> selectPrjLeafs(int dataOwnCode, List<String> accessibleIds) {
Set<String> res = new HashSet<>(); Set<String> res = new HashSet<>();
List<String> prjInfo; List<String> prjInfo;
if (DataOwnEnum.isSysCode(dataOwnCode)) { if (DataOwnEnum.isSysCode(dataOwnCode)) {
prjInfo = querySysPrjTree(PrjQuerySource.SYS_DB.value, null, new FileProjectVO()).getOrDefault(PrjQuerySource.SYS_DB.value, new ArrayList<>()); prjInfo = querySysPrjTree(PrjQuerySource.SYS_DB.value, accessibleIds, new FileProjectVO()).getOrDefault(PrjQuerySource.SYS_DB.value, new ArrayList<>());
} else if (DataOwnEnum.isUserCode(dataOwnCode)) { } else if (DataOwnEnum.isUserCode(dataOwnCode)) {
prjInfo = queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).getOrDefault(PrjQuerySource.USER_DB.value, new ArrayList<>()); prjInfo = queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).getOrDefault(PrjQuerySource.USER_DB.value, new ArrayList<>());
} else { } else {

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
View File

@ -1040,7 +1040,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
lambdaQuery.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId()); lambdaQuery.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId());
} else { } else {
List<String> accessibleIds = permissionService.getAccessibleTree(); List<String> accessibleIds = permissionService.getAccessibleTree();
Set<String> allLeafIds = commonService.selectPrjLeafs(dataOwnCode); Set<String> allLeafIds = commonService.selectPrjLeafs(dataOwnCode, accessibleIds);
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (String leafId : allLeafIds) { for (String leafId : allLeafIds) {
if (accessibleIds.contains(leafId)) { if (accessibleIds.contains(leafId)) {