From 066ee17887f7f3ce4ac540e28b80782f283e2a44 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Fri, 10 Jan 2025 17:37:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/service/serviceimpl/CommonService.java   | 5 ++---
 .../manage/service/serviceimpl/EdPrjServiceImpl.java         | 4 ++--
 2 files changed, 4 insertions(+), 5 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 47034dc..b3a9b7c 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
@@ -141,7 +141,7 @@ public class CommonService {
         return parentId + FILE_TYPE_ENUM.getOrDefault(fileType, "00") + version + timeStr;
     }
 
-    public List<EdFileInfo> selectAllAdminFolder(String id, boolean isAdminQuery) {
+    public List<EdFileInfo> selectAllAdminFolder(String id, boolean isAdminQuery, List<String> accessableIds) {
 
         if (isAdminQuery) {
             return edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
@@ -149,7 +149,6 @@ public class CommonService {
                    .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
                    .eq(EdFileInfo::getParentId, id));
         }
-        List<String> accessableIds = permissionService.getAccessibleTree();
         return edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
                 .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
@@ -239,7 +238,7 @@ public class CommonService {
             List<String> projectVOS = new ArrayList<>();
 
             for (String id : ids) {
-                List<EdFileInfo> edFileInfos = selectAllAdminFolder(id, isAdminQuery);
+                List<EdFileInfo> edFileInfos = selectAllAdminFolder(id, isAdminQuery, prjIds);
                 if (!isAdminQuery) {
                     edFileInfos = edFileInfos.stream().filter(e -> e.getDataStatus().equals(EleDataStatusEnum.PUBLISHED.code)).collect(Collectors.toList());
                 } else {
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
index 37969f0..7ac3e44 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
@@ -322,8 +322,8 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
             String currentUserId = UserThreadLocal.getUserId();
             // 把source工程的层级结构copy到目标工程
             // 查找source的全部目录
-            List<EdFileInfo> sourceEdFileInfos = commonService.selectAllAdminFolder(sourceId, true);
-            List<EdFileInfo> targetEdFileInfos = commonService.selectAllAdminFolder(targetId, true);
+            List<EdFileInfo> sourceEdFileInfos = commonService.selectAllAdminFolder(sourceId, true, null);
+            List<EdFileInfo> targetEdFileInfos = commonService.selectAllAdminFolder(targetId, true, null);
             List<String> needSavePaths = new ArrayList<>();
             // 确定层级最大为prjFolderMaxLength层，现在逐层来处理。
             for (int i = 1; i <= prjFolderMaxLength; ++i) {