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-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
index 656f89f..75edf33 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
@@ -65,9 +65,12 @@
@ApiOperation(value = "导出会员列表")
public void exportPageMgtMember(MgtMemberPageDto mgtMemberPageDto, HttpServletResponse response) {
Page<MgtMemberPageVo> page = new Page<>();
- if(page.getSize()>5000){
+ if(mgtMemberPageDto.getPageSize() > 5000){
page.setSize(5000);
page.setCurrent(1);
+ }else{
+ page.setSize(mgtMemberPageDto.getPageSize());
+ page.setCurrent(mgtMemberPageDto.getPageNum());
}
List<MgtMemberPageVo> mgtShopPageVoList = memberService.pageMgtMember(page,mgtMemberPageDto);
ExcelUtil<MgtMemberPageVo> util = new ExcelUtil<MgtMemberPageVo>(MgtMemberPageVo.class);
@@ -126,9 +129,12 @@
Long userId = SecurityUtils.getUserId();
mgtMemberIntegralPageDto.setUserId(userId);
Page<MgtMemberIntegralPageVo> page = new Page<>();
- if(page.getSize()>5000){
+ if(mgtMemberIntegralPageDto.getPageSize() > 5000){
page.setSize(5000);
page.setCurrent(1);
+ }else{
+ page.setSize(mgtMemberIntegralPageDto.getPageSize());
+ page.setCurrent(mgtMemberIntegralPageDto.getPageNum());
}
List<MgtMemberIntegralPageVo> mgtMemberIntegralPageVoList = integralRecordService.pageMgtMemberIntegral(page,mgtMemberIntegralPageDto);
return R.ok(page.setRecords(mgtMemberIntegralPageVoList));
@@ -165,9 +171,12 @@
Long userId = SecurityUtils.getUserId();
mgtMemberBrowsePageDto.setUserId(userId);
Page<MgtMemberBrowsePageVo> page = new Page<>();
- if(page.getSize()>5000){
+ if(mgtMemberBrowsePageDto.getPageSize() > 5000){
page.setSize(5000);
page.setCurrent(1);
+ }else{
+ page.setSize(mgtMemberBrowsePageDto.getPageSize());
+ page.setCurrent(mgtMemberBrowsePageDto.getPageNum());
}
List<MgtMemberBrowsePageVo> mgtMemberBrowsePageVoList = browseRecordService.pageMgtMemberBrowse(page,mgtMemberBrowsePageDto);
ExcelUtil<MgtMemberBrowsePageVo> util = new ExcelUtil<MgtMemberBrowsePageVo>(MgtMemberBrowsePageVo.class);
@@ -213,9 +222,12 @@
Long userId = SecurityUtils.getUserId();
memberSuggestPageDto.setUserId(userId);
Page<MgtMemberSuggestPageVo> page = new Page<>();
- if(page.getSize()>5000){
+ if(memberSuggestPageDto.getPageSize() > 5000){
page.setSize(5000);
page.setCurrent(1);
+ }else{
+ page.setSize(memberSuggestPageDto.getPageSize());
+ page.setCurrent(memberSuggestPageDto.getPageNum());
}
List<MgtMemberSuggestPageVo> mgtMemberSuggestPageVoList = memberSuggestService.pageMgtMemberSuggest(page,memberSuggestPageDto);
ExcelUtil<MgtMemberSuggestPageVo> util = new ExcelUtil<MgtMemberSuggestPageVo>(MgtMemberSuggestPageVo.class);
--
Gitblit v1.7.1