From 1c8cc72d7e3a7516cbba4b7c30d8c6f8bb6b0f72 Mon Sep 17 00:00:00 2001
From: gulongcheng <474084054@qq.com>
Date: Tue, 31 Mar 2026 11:10:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=A9=BA=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sdm/data/service/impl/MinioFileIDataFileServiceImpl.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
index c99865ca..12c4b13d 100644
--- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
@@ -628,6 +628,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
     public SdmResponse isDirEmpty(Long dirId) {
         return SdmResponse.success(!fileMetadataInfoService.lambdaQuery()
                 .eq(FileMetadataInfo::getParentId, dirId)
+                .isNull(FileMetadataInfo::getDeletedAt)
                 .exists());
     }
 
@@ -660,6 +661,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
             // 2. 空目录快速判定：检查是否存在子项
             boolean hasChildren = fileMetadataInfoService.lambdaQuery()
                     .eq(FileMetadataInfo::getParentId, rootDirId)
+                    .isNull(FileMetadataInfo::getDeletedAt)
                     .exists();
 
             // 3. 需要审批的目录类型且非空：走审批流程，审批通过后由 DeleteApproveStrategy 执行（可按 immediateDelete 决定是否进回收站）