diff --git a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java index b4670c7..940bedb 100644 --- a/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java +++ b/oss-service/src/main/java/cn/axzo/oss/service/impl/FileServiceImpl.java @@ -875,9 +875,13 @@ public class FileServiceImpl implements FileService { return Lists.newArrayList(); } + List responseList = Lists.newArrayList(); + List fileList = fileDao.getByFileUuids(fileKeyList); + //获取不在dbFile中,但是在默认axzo-obs-private中的key + responseList.addAll(fetchNoFileAndObsPrivate(fileKeys, fileList)); if (CollectionUtils.isEmpty(fileList)) { - return Lists.newArrayList(); + return responseList; } //通过appChannelBucketNo集合,获取文件渠道桶信息 @@ -887,9 +891,7 @@ public class FileServiceImpl implements FileService { List fileBusinessSceneList = fileBusinessSceneManager.queryByBucketNoAndScene(fileList.stream().map(File::getAppChannelBucketNo).collect(Collectors.toSet()), bizScene); Map bizSceneExpireMap = fileBusinessSceneList.stream().collect(Collectors.toMap(FileBusinessScene::getAppChannelBucketNo, FileBusinessScene::getDownloadExpiration, (x, y) -> y)); //构建返回集合 - List responseList = this.buildFileKeyRespByFile(fileList, bucketTypeMap, bizSceneExpireMap, style, hasFileName, expiration); - //获取不在dbFile中,但是在默认axzo-obs-private中的key - responseList.addAll(fetchNoFileAndObsPrivate(fileKeys, fileList)); + responseList.addAll(this.buildFileKeyRespByFile(fileList, bucketTypeMap, bizSceneExpireMap, style, hasFileName, expiration)); return responseList; }