From ce34a9afc44dabd60e063f22b1e6a173a712d02d Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Thu, 25 May 2023 16:22:25 +0800
Subject: [PATCH] =?UTF-8?q?2023-05-25=2015:50:18=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/PsdcDeviceMapper.xml  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
index 2c49aac..fa25ed7 100644
--- a/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/PsdcDeviceMapper.xml
@@ -117,7 +117,7 @@
         </where>
     </select>
 
-    <!--分页查询指定行数据-->
+    <!--分页查询指定行数据 Where !(device_model = "温度传感器" And parent_id = 0) -->
     <select id="queryAllByLimit" resultMap="PsdcDeviceMap3">
         Select
         pd.device_id, device_name, device_address, device_status, device_runstatus, parent_id, device_model, su.user_id, su.user_name, is_control,
@@ -126,7 +126,7 @@
         Left Join sys_user su On su.user_id = pd.user_id
         Left Join psdc_electric_rtdata per On per.device_id = pd.device_id
         Left Join psdc_thermometer_rtdata ptr On ptr.device_id = pd.device_id
-        Where !(device_model = "温度传感器" And parent_id = 0)
+        <where>
             <if test="deviceId != null and deviceId != ''">
                 and pd.device_id = #{deviceId}
             </if>
@@ -175,6 +175,7 @@
             <if test="updateTime != null and updateTime != ''">
                 and update_time = #{updateTime}
             </if>
+        </where>
         Order by pd.device_id
     </select>