toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：空文件夹删除

Browse Source
This commit is contained in:
gulongcheng
2026-03-31 11:10:35 +08:00
parent a11c768ed7
commit 1c8cc72d7e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
View File

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