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());