BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：管理员账号拦截推广BUG修复；

pull/1121/head
liujiang 2025-12-05 14:07:29 +08:00
parent 9dad51c9a5
commit 867ef73dca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java
View File

@ -71,7 +71,8 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
List<AdminAdRoundPageResDTO> list = this.advertRoundMapper.selectAdminAdvertPage(pageDTO); List<AdminAdRoundPageResDTO> list = this.advertRoundMapper.selectAdminAdvertPage(pageDTO);
// 所有的商品id列表 // 所有的商品id列表
List<Long> prodIdList = list.stream().filter(x -> StringUtils.isNotBlank(x.getProdIdStr())) List<Long> prodIdList = list.stream().filter(x -> StringUtils.isNotBlank(x.getProdIdStr()))
.flatMap(x -> StrUtil.split(x.getProdIdStr(), ",").stream()).map(Long::parseLong).collect(Collectors.toList()); .flatMap(x -> StrUtil.split(x.getProdIdStr(), ",").stream())
.filter(ObjectUtils::isNotEmpty).map(Long::parseLong).collect(Collectors.toList());
Map<Long, String> storeProdMap = CollectionUtils.isEmpty(prodIdList) ? new ConcurrentHashMap<>() Map<Long, String> storeProdMap = CollectionUtils.isEmpty(prodIdList) ? new ConcurrentHashMap<>()
: this.storeProdMapper.selectByIds(prodIdList).stream().collect(Collectors.toMap(StoreProduct::getId, StoreProduct::getProdArtNum)); : this.storeProdMapper.selectByIds(prodIdList).stream().collect(Collectors.toMap(StoreProduct::getId, StoreProduct::getProdArtNum));
list.forEach(item -> { list.forEach(item -> {
@ -85,7 +86,8 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService {
.setPicSetTypeName(ObjectUtils.isNotEmpty(item.getPicSetType()) ? AdPicSetType.of(item.getPicSetType()).getLabel() : "") .setPicSetTypeName(ObjectUtils.isNotEmpty(item.getPicSetType()) ? AdPicSetType.of(item.getPicSetType()).getLabel() : "")
.setBiddingStatusName(ObjectUtils.isNotEmpty(item.getBiddingStatus()) ? AdBiddingStatus.of(item.getBiddingStatus()).getLabel() : ""); .setBiddingStatusName(ObjectUtils.isNotEmpty(item.getBiddingStatus()) ? AdBiddingStatus.of(item.getBiddingStatus()).getLabel() : "");
if (StringUtils.isNotBlank(item.getProdIdStr())) { if (StringUtils.isNotBlank(item.getProdIdStr())) {
item.setProdArtNumList(StrUtil.split(item.getProdIdStr(), ",").stream().map(Long::parseLong).map(storeProdMap::get).collect(Collectors.toList())); item.setProdArtNumList(StrUtil.split(item.getProdIdStr(), ",").stream().filter(ObjectUtils::isNotEmpty)
.map(Long::parseLong).map(storeProdMap::get).collect(Collectors.toList()));
} }
}); });
return Page.convert(new PageInfo<>(list)); return Page.convert(new PageInfo<>(list));