From 1f3be1364a62c5882da05f66f9b409fb806a7c8d Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Mon, 19 Jun 2023 09:44:53 +0800
Subject: [PATCH] =?UTF-8?q?2023-06-19=2009:26:45=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B8=A9=E5=BA=A6=E4=BC=A0=E6=84=9F=E5=99=A8?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/business/PsdcThermometerHtdataMapper.xml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/psdc-business/src/main/resources/mapper/business/PsdcThermometerHtdataMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcThermometerHtdataMapper.xml
index 9f788af..03c618e 100644
--- a/psdc-business/src/main/resources/mapper/business/PsdcThermometerHtdataMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/PsdcThermometerHtdataMapper.xml
@@ -40,8 +40,9 @@
         From psdc_thermometer_htdata pth
         LEFT JOIN psdc_device pd On pd.device_id = pth.device_id
         <where>
+            pd.device_model = "温度传感器"
             <if test="installAddress != null and installAddress != ''">
-                pd.device_address LIKE concat('%', #{installAddress}, '%')
+                And pd.device_address LIKE concat('%', #{installAddress}, '%')
             </if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
                 And date_format(pth.update_time,'%Y-%m-%d %H:%i:%S') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%S')