From f6c948f093a35f20e8fc94b5d0f893c5647c41b7 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 17 十二月 2024 14:57:47 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
index 5751140..61c0ede 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java
@@ -218,10 +218,14 @@
List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
.eq(AppUser::getPhone, userPoint.getPhone())
.like(AppUser::getName, userPoint.getUserName()));
+ if (appUserList.isEmpty()){
+ return page;
+ }
+
List<Long> userIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList());
Page<UserPoint> userPointPage = page(page, new LambdaQueryWrapper<UserPoint>()
- .in(!CollectionUtils.isEmpty(userIds), UserPoint::getAppUserId, userIds)
+ .in(UserPoint::getAppUserId, userIds)
.eq(userPoint.getType() != null, UserPoint::getType, userPoint.getType())
.between( userPoint.getStartTime()!= null && userPoint.getEndTime() !=null,UserPoint::getCreateTime, userPoint.getStartTime(), userPoint.getEndTime())
.orderByDesc(UserPoint::getCreateTime));
--
Gitblit v1.7.1