From 56cc865a172efd792d7070d41f0447220dc733fc Mon Sep 17 00:00:00 2001 From: gulongcheng <474084054@qq.com> Date: Tue, 31 Mar 2026 11:28:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=BA=BA=E4=B8=8E=E5=AE=9E=E9=99=85=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E7=AC=A6=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/service/impl/MinioFileIDataFileServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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());