From 40356243f5ff75f9133c02e84312d9c7999fb8b9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 17:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
index 32bb927..33f4f12 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
@@ -135,7 +135,7 @@
@ApiOperation(value = "积分管理-用户积分明细(必传用户id)", tags = "后台")
public R<Page<UserPoint>> userlist(UserPoint userPoint) {
Page<UserPoint> page = userPointService.lambdaQuery()
- .eq(UserPoint::getType, userPoint.getType())
+ .eq(userPoint.getType()!=null,UserPoint::getType, userPoint.getType())
.eq(UserPoint::getAppUserId, userPoint.getAppUserId())
.orderByDesc(UserPoint::getCreateTime)
.page(Page.of(userPoint.getPageNum(), userPoint.getPageSize()));
--
Gitblit v1.7.1