From 5d6292b0feff9099a24a1bc2c9f0900f1980e2db Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 18 十二月 2024 16:38:55 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml | 16 ++++++++--------
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserPointMapper.java | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserPointMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserPointMapper.java
index f27bf59..8daeb5c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserPointMapper.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/UserPointMapper.java
@@ -21,5 +21,5 @@
IPage<UserPoint> queryUserPointPage(@Param("page") IPage<UserPoint> page,@Param("userPoint") UserPoint userPoint);
- List<UserPoint> selectUserPoint(UserPoint userPoint);
+ List<UserPoint> selectUserPoint(@Param("userPoint") UserPoint userPoint);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml
index e178692..d054e5e 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml
@@ -39,17 +39,17 @@
t_user_point tup
LEFT JOIN t_app_user tau ON tup.app_user_id = tau.id
<where>
- <if test="userName != null and userName != ''">
- AND tau.`name` LIKE concat('%',#{userName},'%')
+ <if test="userPoint.userName != null and userPoint.userName != ''">
+ AND tau.`name` LIKE concat('%',#{userPoint.userName},'%')
</if>
- <if test="phone != null and phone != ''">
- AND tau.phone LIKE concat('%',#{phone},'%')
+ <if test="userPoint.phone != null and userPoint.phone != ''">
+ AND tau.phone LIKE concat('%',#{userPoint.phone},'%')
</if>
- <if test="type != null and type != ''">
- AND tup.type = #{type}
+ <if test="userPoint.type != null and userPoint.type != ''">
+ AND tup.type = #{userPoint.type}
</if>
- <if test="startTime != null and endTime != null">
- AND tup.create_time BETWEEN #{startTime} AND #{endTime}
+ <if test="userPoint.startTime != null and userPoint.endTime != null">
+ AND tup.create_time BETWEEN #{userPoint.startTime} AND #{userPoint.endTime}
</if>
</where>
</sql>
--
Gitblit v1.7.1