From ee9688b912bb993b54252a26f8ad9e0e04df21c3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 21 六月 2024 18:11:21 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
index c36c276..f4c0722 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java
@@ -88,6 +88,8 @@
// 封装会员条件查询对象
MemberDTO memberDTO = null;
Set<Long> memberIdSet = null;
+ Page<PromotionWishList> page = new Page<>(query.getPageCurr(), query
+ .getPageSize());
if (StringUtils.isNotBlank(query.getNickname()) || StringUtils.isNotBlank(
query.getPhone())) {
memberDTO = new MemberDTO();
@@ -98,17 +100,19 @@
// 远程调用会员服务进行条件查询
List<Member> memberList = memberClient.getMemberListByCondition(memberDTO,
SecurityConstants.INNER).getData();
+ if (StringUtils.isEmpty(memberList)) {
+ return PageDTO.empty(page);
+ }
memberIdSet = memberList.stream().map(Member::getId)
.collect(Collectors.toSet());
}
// 分页查询心愿求购列表
- Page<PromotionWishList> page = this.lambdaQuery()
+ page = this.lambdaQuery()
.eq(StringUtils.isNotNull(query.getReplyStatus()),
PromotionWishList::getReplyStatus, query.getReplyStatus())
.in(StringUtils.isNotEmpty(memberIdSet), PromotionWishList::getMemberId,
- memberIdSet).page(new Page<>(query.getPageCurr(), query
- .getPageSize()));
+ memberIdSet).orderByDesc(PromotionWishList::getCreateTime).page(page);
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page);
}
--
Gitblit v1.7.1