diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index d8bb5c7..d0f09b0 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -493,13 +493,13 @@ public class CommonService { return edFileInfoMapper.selectById(prjId).getFileName(); } - public Set selectPrjLeafs(int dataOwnCode) { + public Set selectPrjLeafs(int dataOwnCode, List accessibleIds) { Set res = new HashSet<>(); List prjInfo; 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)) { prjInfo = queryUserPrjTree(PrjQuerySource.USER_DB.value, new FileProjectVO()).getOrDefault(PrjQuerySource.USER_DB.value, new ArrayList<>()); } else { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index 18a57ed..b447693 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -1040,7 +1040,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl accessibleIds = permissionService.getAccessibleTree(); - Set allLeafIds = commonService.selectPrjLeafs(dataOwnCode); + Set allLeafIds = commonService.selectPrjLeafs(dataOwnCode, accessibleIds); List list = new ArrayList<>(); for (String leafId : allLeafIds) { if (accessibleIds.contains(leafId)) {