From 2d20929b57b4562959f355d20a09a474d46939dd Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期二, 08 八月 2023 21:53:32 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java index 0a79de4..3023797 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtActivityController.java @@ -95,9 +95,12 @@ @ApiOperation(value = "导出活动参与记录列表") public void exportPageMgtActivityRecord( MgtActivityRecordPageDto mgtActivityRecordPageDto, HttpServletResponse response) { Page<MgtActivityRecordPageVo> page = new Page<>(); - if(page.getSize()>5000){ + if(mgtActivityRecordPageDto.getPageSize() > 5000){ page.setSize(5000); page.setCurrent(1); + }else{ + page.setSize(mgtActivityRecordPageDto.getPageSize()); + page.setCurrent(mgtActivityRecordPageDto.getPageNum()); } List<MgtActivityRecordPageVo> activityRecordPageVoList = activityService.pageMgtActivityRecord(page,mgtActivityRecordPageDto); ExcelUtil<MgtActivityRecordPageVo> util = new ExcelUtil<MgtActivityRecordPageVo>(MgtActivityRecordPageVo.class); -- Gitblit v1.7.1