From 493caef7413992d0215b9c2e2bcedd30471d89e7 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 三月 2024 15:49:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
index 99e112e..b07c220 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
@@ -41,7 +41,7 @@
         <include refid="selectArdAlarmWallVo"/>
         <where>
             <if test="wallId != null  and wallId != ''">and wall_id = #{wallId}</if>
-            <if test="wallName != null  and wallName != ''">and wall_name = #{wallName}</if>
+            <if test="wallName != null  and wallName != ''">and wall_name like concat('%', #{wallName}, '%')</if>
             <if test="userId != null  and userId != ''">and user_id = #{userId}</if>
             <if test="alarmType != null  and alarmType != ''">and alarm_type = #{alarmType}</if>
 <!--            <if test="alarmTime != null ">and alarm_time = #{alarmTime}</if>-->
@@ -172,4 +172,4 @@
         from ard_alarm_wall
         where alarm_time &gt;= #{start} and  alarm_time &lt;= #{end}  group by date order by date
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3