Merge branch 'master-高质量运营2'

This commit is contained in:
yss
2023-05-12 23:19:15 +08:00

View File

@ -54,7 +54,7 @@ public class HighQualityStyleServiceImpl extends ServiceImpl<HighQualityStyleMap
query.eq(HighQualityStyle::getCategory, type); query.eq(HighQualityStyle::getCategory, type);
query.ne(HighQualityStyle::getDeleteFlag, "1").eq(HighQualityStyle::getStatus, "1").orderByAsc(HighQualityStyle::getSort); query.ne(HighQualityStyle::getDeleteFlag, "1").eq(HighQualityStyle::getStatus, "1").orderByAsc(HighQualityStyle::getSort);
list = this.list(query); list = this.list(query);
if(!type.equals("4")){ if(!list.isEmpty() && !type.equals("4")){
List<String> imageIdList = list.stream().map(HighQualityStyle::getImage).filter(StrUtil::isNotBlank).distinct().collect(Collectors.toList()); List<String> imageIdList = list.stream().map(HighQualityStyle::getImage).filter(StrUtil::isNotBlank).distinct().collect(Collectors.toList());
BaseResponse<List<DocumentDataVO>> queryReturn = documentCenterService.queryReturn(imageIdList); BaseResponse<List<DocumentDataVO>> queryReturn = documentCenterService.queryReturn(imageIdList);
log.info("文档中心返回:{}", queryReturn.toString()); log.info("文档中心返回:{}", queryReturn.toString());