fix:知识库筛选人与实际结果不符合

This commit is contained in:
2026-03-31 11:28:46 +08:00
parent b23c50da3d
commit 56cc865a17

View File

@@ -936,21 +936,20 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
queryBigFileReq.setApproveTypeList(fileDatdList); queryBigFileReq.setApproveTypeList(fileDatdList);
} }
List<Long> creatorIds = org.apache.commons.lang3.StringUtils.isBlank(minioFileSearchReq.getUploadUserId()) List<Long> uploadUserId = org.apache.commons.lang3.StringUtils.isBlank(minioFileSearchReq.getUploadUserId())
? new ArrayList<>() ? new ArrayList<>()
: Arrays.stream(minioFileSearchReq.getUploadUserId().split(",")) : Arrays.stream(minioFileSearchReq.getUploadUserId().split(","))
.filter(org.apache.commons.lang3.StringUtils::isNotBlank) .filter(org.apache.commons.lang3.StringUtils::isNotBlank)
.map(Long::valueOf) .map(Long::valueOf)
.collect(Collectors.toList()); .collect(Collectors.toList());
queryBigFileReq.setUploadUserId(uploadUserId);
Long userId =ThreadLocalContext.getUserId(); Long userId =ThreadLocalContext.getUserId();
if(CollectionUtils.isNotEmpty(creatorIds)&&!Objects.isNull(userId)){
creatorIds.add(userId);
}
if(!Objects.isNull(userId)){ if(!Objects.isNull(userId)){
queryBigFileReq.setCurrentReqUserId(userId); queryBigFileReq.setCurrentReqUserId(userId);
queryBigFileReq.setApproveAllTypeList(ApproveFileDataTypeEnum.getAllVisibleInFileList()); queryBigFileReq.setApproveAllTypeList(ApproveFileDataTypeEnum.getAllVisibleInFileList());
} }
queryBigFileReq.setUploadUserId(creatorIds);
SdmResponse<PageDataResp<List<FileStorage>>> searchResult = dataStorageAnalysis.listBigFile(queryBigFileReq); SdmResponse<PageDataResp<List<FileStorage>>> searchResult = dataStorageAnalysis.listBigFile(queryBigFileReq);
List<Long> fileIdList = searchResult.getData().getData().stream().map(FileStorage::getFileId).collect(Collectors.toList()); List<Long> fileIdList = searchResult.getData().getData().stream().map(FileStorage::getFileId).collect(Collectors.toList());