From 463add4ee035938f9622a6c981668620f097067d Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 21 八月 2025 15:29:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
index f590d0f..d6b1535 100644
--- a/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
@@ -57,6 +57,12 @@
             lmk_prize_activity LPA
         WHERE
             LPA.delete_flag = 0
+        <if test="query.activityName != null and query.activityName !=''">
+            AND LPA.activity_name LIKE CONCAT('%',#{query.ctivityName},'%')
+        </if>
+        <if test="query.beginTime != null">AND LPA.begin_time >= #{query.beginTime}</if>
+        <if test="query.endTime != null">AND LPA.end_time &lt;= #{query.endTime}</if>
+
     </select>
 
 </mapper>

--
Gitblit v1.8.0