From 8fbb195db75947280ca89c28645653833265d219 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Mon, 1 Apr 2024 16:34:12 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foundation/mapper/xml/DeepExcavationMonitorTypeMapper.xml | 4 ----
 .../highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml       | 4 ----
 .../mapper/xml/SteelStructureMonitorTypeMapper.xml            | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/foundation/mapper/xml/DeepExcavationMonitorTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/foundation/mapper/xml/DeepExcavationMonitorTypeMapper.xml
index abc30b9c1..9be200a70 100644
--- a/src/main/java/com/zhgd/xmgl/modules/foundation/mapper/xml/DeepExcavationMonitorTypeMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/foundation/mapper/xml/DeepExcavationMonitorTypeMapper.xml
@@ -50,17 +50,13 @@
                                      INNER JOIN deep_excavation_measure_point t2
                                                 ON des.measure_point_number = t2.measure_point_number
                             <where>
-                                <if test="deepExcavationId != null and deepExcavationId != ''">
                                     t2.deep_excavation_id = #{deepExcavationId}
-                                </if>
                             </where>
                               AND decd.receive_time >=
                                   CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00')
                             GROUP BY t2.rela_id) c ON demtr.id = c.rela_id
             <where>
-                <if test="deepExcavationId != null and deepExcavationId != ''">
                     demtr.deep_excavation_id = #{deepExcavationId}
-                </if>
             </where>
     </select>
     <select id="selectMonitorTypeAlarmCountList"
diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml
index 5034c60d3..a9b2245bb 100644
--- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml
@@ -51,18 +51,14 @@
         INNER JOIN high_slope_measure_point t2
         ON des.measure_point_number = t2.measure_point_number
         <where>
-            <if test="highSlopeEngineeringId != null and highSlopeEngineeringId != ''">
                 t2.high_slope_engineering_id = #{highSlopeEngineeringId}
-            </if>
         </where>
         AND decd.receive_time >=
         CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00')
         GROUP BY t2.high_slope_engineering_to_monitor_type_id) c ON demtr.id =
         c.high_slope_engineering_to_monitor_type_id
         <where>
-            <if test="highSlopeEngineeringId != null and highSlopeEngineeringId != ''">
                 demtr.high_slope_engineering_id = #{highSlopeEngineeringId}
-            </if>
         </where>
     </select>
     <select id="selectMonitorTypeAlarmCountList" resultType="java.util.Map">
diff --git a/src/main/java/com/zhgd/xmgl/modules/steelstructure/mapper/xml/SteelStructureMonitorTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/steelstructure/mapper/xml/SteelStructureMonitorTypeMapper.xml
index 32d1d777f..66d3cd198 100644
--- a/src/main/java/com/zhgd/xmgl/modules/steelstructure/mapper/xml/SteelStructureMonitorTypeMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/steelstructure/mapper/xml/SteelStructureMonitorTypeMapper.xml
@@ -52,18 +52,14 @@
         INNER JOIN steel_structure_measure_point t2
         ON des.measure_point_number = t2.measure_point_number
         <where>
-            <if test="steelStructureEngineeringId != null and steelStructureEngineeringId != ''">
                 t2.steel_structure_engineering_id = #{steelStructureEngineeringId}
-            </if>
         </where>
         AND decd.receive_time >=
         CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00')
         GROUP BY t2.steel_structure_engineering_to_monitor_type_id) c ON demtr.id =
         c.steel_structure_engineering_to_monitor_type_id
         <where>
-            <if test="steelStructureEngineeringId != null and steelStructureEngineeringId != ''">
                 demtr.steel_structure_engineering_id = #{steelStructureEngineeringId}
-            </if>
         </where>
     </select>
     <select id="selectMonitorTypeAlarmCountList" resultType="java.util.Map">