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 956ebac..ea6da71 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
@@ -295,6 +295,9 @@ public class CommonService {
 
             // 如果是数据库界面查询，此处需要进行权限筛选
             if (querySource == PrjQuerySource.SYS_DB.value) {
+                if (CollUtil.isEmpty(accessibleIds)) {
+                    return map;
+                }
                 queryWrapper.in(EdFileInfo::getId, accessibleIds);
             }
             List<String> prjIds = edFileInfoMapper.selectList(queryWrapper).stream().map(EdFileInfo::getId).collect(Collectors.toList());
@@ -499,17 +502,18 @@ public class CommonService {
 
         List<String> prjInfo;
         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) {
-            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 {
-            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());
             res.addAll(leafIds);
-        });
+        }
         return res;
     }