From bb23b0d78b0cfac29c802dae07c9177518d09d75 Mon Sep 17 00:00:00 2001
From: guoxin <371864209@qq.com>
Date: Sun, 17 Sep 2023 03:53:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9=E4=B8=8A=E4=BC=A0=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E6=98=AF=E5=90=A6=E6=98=AF=E8=BD=AF=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=88=A4=E6=96=AD=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=98=AF=E5=88=99=E4=B8=8A=E4=BC=A0=E5=88=B0=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shandan/bianmu/controller/DirectoryController.java |  8 ++++++--
 .../shandan/bianmu/service/DirectoryTreeService.java   | 10 +++++++++-
 .../shandan/system/controller/SysFileController.java   |  2 +-
 .../system/service/impl/SysFileServiceImpl.java        |  4 ++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/DirectoryController.java b/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/DirectoryController.java
index 474bab9..8a04293 100644
--- a/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/DirectoryController.java
+++ b/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/DirectoryController.java
@@ -76,10 +76,14 @@ public class DirectoryController extends BaseController<DirectoryService, Direct
 
         DirectoryVo dir = directoryService.getById(directoryId);
         Assert.notNull(dir, "目录不存在");
-
+        if (DirectoryType.LINK_DIR == dir.getDirectoryType()) {
+            dir = directoryService.getById(dir.getResourceId());
+            Assert.notNull(dir, "软连接源目录不存在");
+        }
+        String parentId = dir.getId();
         // 将关联的数据资源插入到目录表中去
         List<DirectoryVo> metaDirList = Arrays.stream(metadataIds.split(","))
-                .map(id -> directoryBuilder.buildMetadataDir(directoryId, id))
+                .map(id -> directoryBuilder.buildMetadataDir(parentId, id))
                 .collect(Collectors.toList());
         directoryService.saveBatch(metaDirList);
 
diff --git a/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java b/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java
index 7351196..aa6a12e 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java
@@ -153,7 +153,7 @@ public class DirectoryTreeService {
         }
         Set<String> allowDirIds = dirPermissionService.getByReadPermis(SecurityUtil.getLoginSysUser());
         Set<String> dirIds = allDir.stream().map(DirectoryVo::getId).filter(allowDirIds::contains).collect(Collectors.toSet());
-        dirIds.add(parentId);
+        //dirIds.add(DirectoryType.LINK_DIR == parent.getDirectoryType() ? parent.getResourceId() : parentId);
         QueryWrapper<DirectoryResource> query = new QueryWrapper<>();
         query.in("PARENT_ID", dirIds);
         if (StringUtils.hasText(text)) {
@@ -169,6 +169,14 @@ public class DirectoryTreeService {
 
     private void allDirectoryByParent(DirectoryVo parent, HashSet<DirectoryVo> result) {
         String parentId = DirectoryType.LINK_DIR == parent.getDirectoryType() ? parent.getResourceId() : parent.getId();
+        if(DirectoryType.LINK_DIR == parent.getDirectoryType()){
+            DirectoryVo linkDir = directoryService.getById(parent.getResourceId());
+            if(linkDir != null){
+                result.add(linkDir);
+            }
+        }else{
+            result.add(parent);
+        }
         List<DirectoryVo> children = directoryService.childrenListByParent(parentId);
         children.forEach(dir -> {
             result.add(dir);
diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
index a06548e..52abb96 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
@@ -200,7 +200,7 @@ public class SysFileController extends BaseController<SysFileService, SysFile, S
      */
     @PostMapping("/upload/chunk/complete")
     public Result<Object> mergerChunk(SysFile file) throws Exception {
-        FileChunkUploadUtil.mergeChunk(file, sysFIle -> sysFileService.save(sysFIle));
+        FileChunkUploadUtil.mergeChunk(file, sysFile -> sysFileService.save(sysFile));
         return Result.of(sysFileService.autoCreateDirAndUpdateFile(file));
     }
 
diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFileServiceImpl.java b/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFileServiceImpl.java
index 23a10f3..bd71d39 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFileServiceImpl.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFileServiceImpl.java
@@ -216,6 +216,10 @@ public class SysFileServiceImpl extends BaseServiceImpl<SysFileMapper, SysFile,
         // 当前选中的目录
         DirectoryVo currentDir = directoryService.getById(file.getEntityId());
         Assert.notNull(currentDir, "资源目录未找到，目录ID：" + file.getEntityId());
+        if (DirectoryType.LINK_DIR == currentDir.getDirectoryType()) {
+            currentDir = directoryService.getById(currentDir.getResourceId());
+            Assert.notNull(currentDir, "软连接的源目录未找到，目录ID：" + file.getEntityId());
+        }
         // 根据文件全路径生成目录
         DirectoryVo parentDir = getOrCreateDirectoryByPath(file, currentDir);