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