diff --git a/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java b/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java index e4ee8723..1eb73504 100644 --- a/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/DataStorageAnalysisImpl.java @@ -259,6 +259,7 @@ public class DataStorageAnalysisImpl implements DataStorageAnalysis { .eq(FileMetadataInfo::getRelatedResourceUuidOwnType, queryNodeType) .in(FileMetadataInfo::getOriginalName, queryNodeNames) .eq(FileMetadataInfo::getTenantId, tenantId) + .isNull(FileMetadataInfo::getDeletedAt) .list(); } diff --git a/data/src/main/resources/mapper/FileStorageMapper.xml b/data/src/main/resources/mapper/FileStorageMapper.xml index 977513d8..2ad504a6 100644 --- a/data/src/main/resources/mapper/FileStorageMapper.xml +++ b/data/src/main/resources/mapper/FileStorageMapper.xml @@ -18,12 +18,12 @@ file_storage fs where fs.dirId - in(select id from file_metadata_info fmi where fmi.relatedResourceUuidOwnType = #{queryNodeType} and fmi.tenantId = #{tenantId} ) + in(select id from file_metadata_info fmi where fmi.relatedResourceUuidOwnType = #{queryNodeType} and fmi.tenantId = #{tenantId} and fmi.deletedAt IS NULL) group by fs.dirId) dirSize left join file_metadata_info ON dirSize.dirId = file_metadata_info.id - where file_metadata_info.tenantId = #{tenantId} + where file_metadata_info.tenantId = #{tenantId} and file_metadata_info.deletedAt IS NULL group by file_metadata_info.originalName order by