From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/resources/mapper/LightReportDataMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dao/src/main/resources/mapper/LightReportDataMapper.xml b/dao/src/main/resources/mapper/LightReportDataMapper.xml
index 649f93f..b1456bd 100644
--- a/dao/src/main/resources/mapper/LightReportDataMapper.xml
+++ b/dao/src/main/resources/mapper/LightReportDataMapper.xml
@@ -51,15 +51,18 @@
light_report_data t1
LEFT JOIN pole t2 USING ( device_code )
<where>
+ 1 = 1
+
+ <if test="deviceCode != null and deviceCode != ''">
+ AND t1.device_code = #{deviceCode}
+ </if>
<if test="keyword != null and keyword != ''">
AND (
t1.device_code LIKE CONCAT('%', #{keyword},'%')
OR t2.pole_name LIKE CONCAT('%', #{keyword},'%')
)
</if>
- <if test="deviceCode != null and keyword != ''">
- AND t1.device_code = #{deviceCode}
- </if>
+
</where>
ORDER BY t1.light_report_data_id DESC
</select>
--
Gitblit v1.9.3