From 6073aef7c02a927cb16fc929f5c8a1f420f5e450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com>
Date: Mon, 26 Jul 2021 21:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qiwenshare/file/controller/FiletransferController.java    | 3 +--
 .../java/com/qiwenshare/file/service/FiletransferService.java | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qiwenshare/file/controller/FiletransferController.java b/src/main/java/com/qiwenshare/file/controller/FiletransferController.java
index 804eac0..59d5af8 100644
--- a/src/main/java/com/qiwenshare/file/controller/FiletransferController.java
+++ b/src/main/java/com/qiwenshare/file/controller/FiletransferController.java
@@ -86,8 +86,7 @@ public class FiletransferController {
             if (relativePath.contains("/")) {
                 userFile.setFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/");
                 fileDealComp.restoreParentFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/", sessionUserBean.getUserId());
-                String rootPath = relativePath.split("/")[0];
-                fileDealComp.deleteRepeatSubDirFile(uploadFileDto.getFilePath() + rootPath + "/", sessionUserBean.getUserId());
+                fileDealComp.deleteRepeatSubDirFile(uploadFileDto.getFilePath(), sessionUserBean.getUserId());
             } else {
                 userFile.setFilePath(uploadFileDto.getFilePath());
             }
diff --git a/src/main/java/com/qiwenshare/file/service/FiletransferService.java b/src/main/java/com/qiwenshare/file/service/FiletransferService.java
index b012511..3c97d9d 100644
--- a/src/main/java/com/qiwenshare/file/service/FiletransferService.java
+++ b/src/main/java/com/qiwenshare/file/service/FiletransferService.java
@@ -103,9 +103,7 @@ public class FiletransferService implements IFiletransferService {
                 if (relativePath.contains("/")) {
                     userFile.setFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/");
                     fileDealComp.restoreParentFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/", userId);
-                    String rootPath = relativePath.split("/")[0];
-
-                    fileDealComp.deleteRepeatSubDirFile(uploadFileDto.getFilePath() + rootPath + "/", userId);
+                    fileDealComp.deleteRepeatSubDirFile(uploadFileDto.getFilePath(), userId);
 
                 } else {
                     userFile.setFilePath(uploadFileDto.getFilePath());