From 06f59ebb282ab74565585f77dde772d228d6075a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 14:13:10 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
index 05e3d6d..4759e30 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberPointsServiceImpl.java
@@ -55,16 +55,21 @@
@Override
public PageDTO<MgtMemberPointsVO> getMemberPointsPage(MgtMemberPointsQuery query) {
Set<Long> memberIdSet = null;
+ Page<MemberPoints> page = new Page<>(query.getPageCurr(), query.getPageSize());
MemberDTO memberDTO = getMemberQueryParam(query);
if (StringUtils.isNotNull(memberDTO)) {
memberIdSet = getMemberIdSet(memberDTO);
+ if (StringUtils.isEmpty(memberIdSet)) {
+ return PageDTO.empty(page);
+ }
}
// 分页查询积分
- Page<MemberPoints> page = this.lambdaQuery()
+ page = this.lambdaQuery()
.eq(StringUtils.isNotNull(query.getPointsStatus()), MemberPoints::getPointsStatus,
query.getPointsStatus())
.in(StringUtils.isNotEmpty(memberIdSet), MemberPoints::getMemberId, memberIdSet)
- .page(new Page<>(query.getPageCurr(), query.getPageSize()));
+ .orderByDesc(MemberPoints::getCreateTime)
+ .page(page);
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
}
--
Gitblit v1.7.1