Merge branch 'channeloff_0518' into dev

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelTicketController.java

@@ -60,7 +60,7 @@ public class ChannelTicketController extends BaseApiController {
   @ApiOperation(value = "盲票组列表" , notes = "获取所有盲票信息")
   public TableDataInfo list(@RequestBody TicketBoxParam param) {
     // TODO 根据标签过滤
-    startPage();
+
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     Channel channel = channelService.getById(channelId);
     List<Long> channelIds = new ArrayList<>();
@@ -84,7 +84,7 @@ public class ChannelTicketController extends BaseApiController {
         wrapper.or().in("t2.channel_id",channelIds);
       }
     });
-
+    startPage();
     List<TicketBox> ticketBoxes  = ticketBoxService.listBySaleChannel(queryWrapper);
 
 //    List<TicketBox> ticketBoxes = ticketBoxService.list(