Browse Source

导出盲票

chunping 3 years ago
parent
commit
d86092600d

+ 1 - 1
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -189,7 +189,7 @@ public class TicketBoxMgrController extends BaseApiController {
 				LambdaQueryWrapper<Ticket> pageQueryWrapper = new LambdaQueryWrapper<Ticket>();
 				pageQueryWrapper.eq(Ticket::getBoxId, ids.getIds().get(0));
 				pageQueryWrapper.orderByAsc(Ticket::getSerialNo);
-				pageQueryWrapper.last("limit "+(i+1)+", " + pageSize);
+				pageQueryWrapper.last("limit "+ (i*pageSize) +", " + pageSize);
 				List<Ticket> list = ticketService.list(pageQueryWrapper);
 				if(null != list && list.size() > 0 ) {
 					listAll.addAll(list);

+ 2 - 2
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserAddrController.java

@@ -49,9 +49,9 @@ public class UserAddrController {
   @PostMapping("/addr/list")
   @ApiOperation(value = "渠道地址列表" , notes = "获取渠道的所有地址信息")
   public AjaxResult list(@RequestBody AddrParam addrParam) {
-    Long channelId = SecurityUtils.getLoginUser().getChannelId();
+    Long userId = SecurityUtils.getLoginUser().getUserId();
     List<UserAddr> userAddrs = userAddrService.list(
-        new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId, channelId)
+        new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId, userId)
             .orderByDesc(UserAddr::getCommonAddr).orderByDesc(UserAddr::getUpdateTime));
     return AjaxResult.success(userAddrs);
   }