|  | @@ -87,6 +87,9 @@ public class PromoChannelServiceImpl extends ServiceImpl<PromoChannelMapper, Pro
 | 
											
												
													
														|  |          //相关条件
 |  |          //相关条件
 | 
											
												
													
														|  |          Set<Long> gameIdSet = gameMap == null ? null : gameMap.keySet();
 |  |          Set<Long> gameIdSet = gameMap == null ? null : gameMap.keySet();
 | 
											
												
													
														|  |          Set<Long> promoAccountIdSet = promoAccountMap == null ? null : promoAccountMap.keySet();
 |  |          Set<Long> promoAccountIdSet = promoAccountMap == null ? null : promoAccountMap.keySet();
 | 
											
												
													
														|  | 
 |  | +        final Map<Long, GameDTO> gameConditionMap = gameMap == null ? gameService.gameMap() : gameMap;
 | 
											
												
													
														|  | 
 |  | +        final Map<Long, PromoAccountDTO> promoAccountConditionMap = promoAccountMap == null ? promoAccountService.promoAccountMap() : promoAccountMap;
 | 
											
												
													
														|  | 
 |  | +        //查询
 | 
											
												
													
														|  |          return page(param.toPage(), new QueryWrapper<PromoChannel>().lambda()
 |  |          return page(param.toPage(), new QueryWrapper<PromoChannel>().lambda()
 | 
											
												
													
														|  |                  .in(CollectionUtils.isNotEmpty(gameIdSet), PromoChannel::getGameId, gameIdSet)
 |  |                  .in(CollectionUtils.isNotEmpty(gameIdSet), PromoChannel::getGameId, gameIdSet)
 | 
											
												
													
														|  |                  .in(CollectionUtils.isNotEmpty(promoAccountIdSet), PromoChannel::getAccountId, promoAccountIdSet)
 |  |                  .in(CollectionUtils.isNotEmpty(promoAccountIdSet), PromoChannel::getAccountId, promoAccountIdSet)
 | 
											
										
											
												
													
														|  | @@ -96,7 +99,7 @@ public class PromoChannelServiceImpl extends ServiceImpl<PromoChannelMapper, Pro
 | 
											
												
													
														|  |                  .eq(param.getProviderId() != null, PromoChannel::getProviderId, param.getProviderId())
 |  |                  .eq(param.getProviderId() != null, PromoChannel::getProviderId, param.getProviderId())
 | 
											
												
													
														|  |                  .eq(param.getStatus() != null, PromoChannel::getStatus, param.getStatus())
 |  |                  .eq(param.getStatus() != null, PromoChannel::getStatus, param.getStatus())
 | 
											
												
													
														|  |                  .orderByDesc(PromoChannel::getCreateTime))
 |  |                  .orderByDesc(PromoChannel::getCreateTime))
 | 
											
												
													
														|  | -                .convert(promoAccount -> this.toVo(promoAccountMap, promoMediaMap, promoAccount, promoSiteMap, gameMap, gameCategoryMap));
 |  | 
 | 
											
												
													
														|  | 
 |  | +                .convert(promoAccount -> this.toVo(promoAccountConditionMap, promoMediaMap, promoAccount, promoSiteMap, gameConditionMap, gameCategoryMap));
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      /**
 |  |      /**
 |