|
|
@ -163,10 +163,10 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { |
|
|
if (channel==null){ |
|
|
if (channel==null){ |
|
|
return "角色频道有误"; |
|
|
return "角色频道有误"; |
|
|
} |
|
|
} |
|
|
if (channel.equals("全部")){ |
|
|
|
|
|
beanConsumeLive.setLiveChannel(null); |
|
|
|
|
|
|
|
|
if (!channel.equals("全部")){ |
|
|
|
|
|
beanConsumeLive.setLiveChannel(channel); |
|
|
} |
|
|
} |
|
|
beanConsumeLive.setLiveChannel(channel); |
|
|
|
|
|
|
|
|
|
|
|
List<BeanConsumeLive> beanConsumeLives = liveMapper.selectLiveBy(beanConsumeLive); |
|
|
List<BeanConsumeLive> beanConsumeLives = liveMapper.selectLiveBy(beanConsumeLive); |
|
|
//int total = liveMapper.selectLiveCount(beanConsumeLive); |
|
|
//int total = liveMapper.selectLiveCount(beanConsumeLive); |
|
|
return new PageInfo<>(beanConsumeLives); |
|
|
return new PageInfo<>(beanConsumeLives); |
|
|
@ -175,6 +175,13 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { |
|
|
@Override |
|
|
@Override |
|
|
public Object selectFanBy(Integer pageNum, Integer pageSize, BeanConsumeFan beanConsumeFan) { |
|
|
public Object selectFanBy(Integer pageNum, Integer pageSize, BeanConsumeFan beanConsumeFan) { |
|
|
PageHelper.startPage(pageNum, pageSize); |
|
|
PageHelper.startPage(pageNum, pageSize); |
|
|
|
|
|
String channel=roleMapper.getChannel(beanConsumeFan.getRoleId()); |
|
|
|
|
|
if (channel==null){ |
|
|
|
|
|
return "角色频道有误"; |
|
|
|
|
|
} |
|
|
|
|
|
if (!channel.equals("全部")){ |
|
|
|
|
|
beanConsumeFan.setChannel(channel); |
|
|
|
|
|
} |
|
|
List<BeanConsumeFan> beanConsumeFans = beanConsumeMapper.selectFanBy(beanConsumeFan); |
|
|
List<BeanConsumeFan> beanConsumeFans = beanConsumeMapper.selectFanBy(beanConsumeFan); |
|
|
return new PageInfo<>(beanConsumeFans); |
|
|
return new PageInfo<>(beanConsumeFans); |
|
|
} |
|
|
} |
|
|
|