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-17 16:50:16 +08:00
parent 6fda96ade5
commit ade8dcc642
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1132,16 +1132,20 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
.eq(ObjectUtils.isNotEmpty(req.getQueryTarget()), FileMetadataInfo::getDataType, req.getQueryTarget())
.like(ObjectUtils.isNotEmpty(req.getFileName()), FileMetadataInfo::getOriginalName, req.getFileName())
.eq(FileMetadataInfo::getIsLatest, FileIsLastEnum.YES.getValue())
.ne(req.getIsFilterApproving(),FileMetadataInfo::getApprovalStatus,ApprovalFileDataStatusEnum.PENDING.getKey() )
.isNull(FileMetadataInfo::getDeletedAt)
// ===================== 兼容 userId 为空 =====================
// 如果 userId 不为空：区分自己/别人
.nested(!Objects.isNull(userId), wrapper -> wrapper
.eq(FileMetadataInfo::getCreatorId, userId)
.in(FileMetadataInfo::getApproveType, allVisibleInFileList)
.or()
.ne(FileMetadataInfo::getCreatorId, userId)
.in(FileMetadataInfo::getApproveType, fileDatdList)
.and(inner -> inner
.eq(FileMetadataInfo::getCreatorId, userId)
.in(FileMetadataInfo::getApproveType, allVisibleInFileList)
)
.or(inner -> inner
.ne(FileMetadataInfo::getCreatorId, userId)
.in(FileMetadataInfo::getApproveType, fileDatdList)
)
)
// 如果 userId 为空：统一走普通可见状态
.in(Objects.isNull(userId), FileMetadataInfo::getApproveType, fileDatdList)