From 634dd427781672b112a1d06dcff462b93255d207 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Wed, 19 Feb 2025 16:20:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B1=82=E7=BA=A7=E6=B2=BF?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/EdPrjServiceImpl.java | 26 ++++++++++++-------
 .../src/main/resources/application.properties |  1 -
 2 files changed, 16 insertions(+), 11 deletions(-)

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 0b5d688..5d6c291 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
@@ -325,29 +325,35 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
             // 把source工程的层级结构copy到目标工程
             // 查找source的全部目录
             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) {
+                List<EdFileInfo> targetEdFileInfos = commonService.selectAllAdminFolder(targetId, true, null);
                 // 先查找source第i层下有那些子集
                 final int count = i;
-                EdFileInfo targetParentFile = targetEdFileInfos.stream()
-                        .filter(e -> StrUtil.count(e.getFilePath(), MYSQL_FILE_PATH_SPLIT) == count - 1)
-                        .collect(Collectors.toList()).stream().findFirst().orElse(null);
-                if (targetParentFile == null) {
-                    continue;
-                }
+                // 取source当前层
                 List<EdFileInfo> sourceTmpEdFiles = sourceEdFileInfos.stream()
                         .filter(e -> StrUtil.count(e.getFilePath(), MYSQL_FILE_PATH_SPLIT) == count)
                         .collect(Collectors.toList());
+                // 取target父层
                 List<EdFileInfo> targetTmpEdFiles = targetEdFileInfos.stream()
-                        .filter(e -> StrUtil.count(e.getFilePath(), MYSQL_FILE_PATH_SPLIT) == count)
+                        .filter(e -> StrUtil.count(e.getFilePath(), MYSQL_FILE_PATH_SPLIT) == count - 1)
+                        .collect(Collectors.toList());
+                // 获取source名称的map
+                Map<String, EdFileInfo> sourceFileNameMap = sourceTmpEdFiles.stream()
+                        .collect(Collectors.toMap(EdFileInfo::getFileName, e -> e));
+                // 获取target当前层级的子集名称
+                List<String> targetFileNames = targetTmpEdFiles.stream()
+                        .filter(e -> StrUtil.count(e.getFilePath(), MYSQL_FILE_PATH_SPLIT) == count)
+                        .map(EdFileInfo::getFileName)
                         .collect(Collectors.toList());
-                Map<String, EdFileInfo> sourceFileNameMap = sourceTmpEdFiles.stream().collect(Collectors.toMap(EdFileInfo::getFileName, e -> e));
-                List<String> targetFileNames = targetTmpEdFiles.stream().map(EdFileInfo::getFileName).collect(Collectors.toList());
                 int sort = targetTmpEdFiles.size();
                 for (EdFileInfo edFileInfo : sourceTmpEdFiles) {
                     String sourceFileName = edFileInfo.getFileName();
+
+                    String sourceFileParentName = sourceEdFileInfos.stream().filter(e -> e.getId().equals(edFileInfo.getParentId())).findFirst().get().getFileName();
+                    EdFileInfo targetParentFile = i == 1 ? targetTmpEdFiles.stream().filter(e -> e.getId().equals(targetId)).findFirst().get() : targetTmpEdFiles.stream().filter(e -> e.getFileName().equals(sourceFileParentName)).findFirst().get();
+
                     if (!targetFileNames.contains(sourceFileName)) {
                         EdFileInfo sourceFile = sourceFileNameMap.get(sourceFileName);
                         EdFileInfo targetFile = new EdFileInfo();
diff --git a/electrmangnetic/src/main/resources/application.properties b/electrmangnetic/src/main/resources/application.properties
index 8c19a2d..9a20aa3 100644
--- a/electrmangnetic/src/main/resources/application.properties
+++ b/electrmangnetic/src/main/resources/application.properties
@@ -14,7 +14,6 @@ pagehelper.helperDialect=mysql
 pagehelper.reasonable=false
 server.port=12395
 file.security.passwd=adknfhkj87654knd
-#windows文件存储目录，用于测试
 data.windows.path=D:/tmp/eleData/project/
 data.linux.path=/szsd/data/eleData/project/
 data.upload.windows.tmp.path=D:/tmp/eleData/upload/