diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java index f1db1de..6b50165 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -163,10 +163,10 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { if (channel==null){ return "角色频道有误"; } - if (channel.equals("全部")){ - beanConsumeLive.setLiveChannel(null); + if (!channel.equals("全部")){ + beanConsumeLive.setLiveChannel(channel); } - beanConsumeLive.setLiveChannel(channel); + List beanConsumeLives = liveMapper.selectLiveBy(beanConsumeLive); //int total = liveMapper.selectLiveCount(beanConsumeLive); return new PageInfo<>(beanConsumeLives); @@ -175,6 +175,13 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { @Override public Object selectFanBy(Integer pageNum, Integer pageSize, BeanConsumeFan beanConsumeFan) { PageHelper.startPage(pageNum, pageSize); + String channel=roleMapper.getChannel(beanConsumeFan.getRoleId()); + if (channel==null){ + return "角色频道有误"; + } + if (!channel.equals("全部")){ + beanConsumeFan.setChannel(channel); + } List beanConsumeFans = beanConsumeMapper.selectFanBy(beanConsumeFan); return new PageInfo<>(beanConsumeFans); }