From 7e96ca171e8bfabcf07c7354698629f993089368 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 25 Mar 2025 10:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8F=91=E5=B8=83=E7=AE=A1=E7=90=86=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/service/serviceimpl/CommonService.java    | 4 ++--
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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<String> selectPrjLeafs(int dataOwnCode) {
+    public Set<String> selectPrjLeafs(int dataOwnCode, List<String> accessibleIds) {
 
         Set<String> res = new HashSet<>();
 
         List<String> 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<EdFileInfoMapper, EdFileI
             lambdaQuery.eq(EdFileInfo::getCreatedBy, UserThreadLocal.getUserId());
         } else {
             List<String> accessibleIds = permissionService.getAccessibleTree();
-            Set<String> allLeafIds = commonService.selectPrjLeafs(dataOwnCode);
+            Set<String> allLeafIds = commonService.selectPrjLeafs(dataOwnCode, accessibleIds);
             List<String> list = new ArrayList<>();
             for (String leafId : allLeafIds) {
                 if (accessibleIds.contains(leafId)) {