From e00e10418b01eb0ee442b2dc4029925fba7ae33b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 20 十一月 2025 09:16:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
index c4cee58..5d22308 100644
--- a/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
@@ -60,11 +60,17 @@
WHERE
LPA.delete_flag = 0
<if test="query.activityName != null and query.activityName !=''">
- AND LPA.activity_name LIKE CONCAT('%',#{query.ctivityName},'%')
+ AND LPA.activity_name LIKE CONCAT('%',#{query.activityName},'%')
</if>
<if test="query.beginTime != null">AND LPA.begin_time >= #{query.beginTime}</if>
<if test="query.endTime != null">AND LPA.end_time <= #{query.endTime}</if>
-
+ <if test="query.enableStatus !=null and query.enableStatus !=''">
+ AND LPA.enable_status = #{query.enableStatus}
+ </if>
+ <if test="query.popup !=null and query.popup !=''">
+ AND LPA.popup = #{query.popup}
+ </if>
+ order by LPA.create_time DESC
</select>
<resultMap id="prizeInfoMap" type="cn.lili.modules.lmk.domain.vo.PrizeDetailVO">
<id property="id" column="id"/>
--
Gitblit v1.8.0