From dfd75c65c3044e4c5fb18d9fe8cad2387aff57b9 Mon Sep 17 00:00:00 2001 From: jmal Date: Wed, 27 Nov 2024 17:17:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8E=E7=BB=9F=E8=AE=A1=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E4=B8=8D=E5=8F=98=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmal/clouddisk/service/impl/FileServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jmal/clouddisk/service/impl/FileServiceImpl.java b/src/main/java/com/jmal/clouddisk/service/impl/FileServiceImpl.java index 27c05ad2..71e6009e 100644 --- a/src/main/java/com/jmal/clouddisk/service/impl/FileServiceImpl.java +++ b/src/main/java/com/jmal/clouddisk/service/impl/FileServiceImpl.java @@ -1988,8 +1988,10 @@ public ResponseResult delete(String username, String currentDirectory, L if (Boolean.TRUE.equals(fileDocument.getIsFolder())) { // 删除文件夹及其下的所有文件 List delFileDocumentList = mongoTemplate.findAllAndRemove(getAllByFolderQuery(fileDocument), FileDocument.class, COLLECTION_NAME); - // 移动到回收站 - moveToTrash(username, delFileDocumentList, true); + if (!sweep) { + // 移动到回收站 + moveToTrash(username, delFileDocumentList, true); + } // 提取出delFileDocumentList中文件id List delFileIds = delFileDocumentList.stream().map(FileDocument::getId).collect(Collectors.toList()); deleteDependencies(username, delFileIds, sweep);