From 154b73d12f9e39039fc7b099beab3881c94b2d8d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 21 Nov 2019 12:42:00 +0800
Subject: [PATCH] update:请求合并

---
 src/main/resources/mapper/HistoryDailyMapper.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/HistoryDailyMapper.xml b/src/main/resources/mapper/HistoryDailyMapper.xml
index 78e7f3f..d9e25e7 100644
--- a/src/main/resources/mapper/HistoryDailyMapper.xml
+++ b/src/main/resources/mapper/HistoryDailyMapper.xml
@@ -14,10 +14,10 @@
             hd.mac = vdi.mac
             AND vdi.monitor_point_id = mp.id
             AND vdi.device_tech = 1
-            <if test="monitorPointId != null and monitorPointId!=''">
+            <if test="monitorPointId != null">
                 AND mp.id = #{monitorPointId}
             </if>
-            <if test="mac != null and mac!=''">
+            <if test="mac != null">
                 AND hd.mac = #{mac}
             </if>
             <if test="start != null">
@@ -111,10 +111,10 @@
         FROM
         history_daily
         <where>
-            <if test="mac!=null and mac!=''">
+            <if test="mac!=null">
                 AND mac=#{mac}
             </if>
-            <if test="time!=null and time!=''">
+            <if test="time!=null">
                 AND time=#{time}
             </if>
         </where>

--
Gitblit v1.8.0