From 26c4c1cd7195a40d30b4d23f6752a808db40f0b3 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Tue, 2 Jul 2024 11:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/business/DcDeviceMapper.xml    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
index bd6fa612..60ed7ff8 100644
--- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
@@ -158,7 +158,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="deviceState != null  and deviceState != ''">and device_state = #{deviceState}</if>
             <if test="deviceName != null  and deviceName != ''">and device_name like concat('%', #{deviceName}, '%')</if>
-            and (device_type=3||device_type=13||device_type=15||device_type=16||device_type=17) and iot_device_id is not null
+            <if test="deviceType != null  and deviceType != ''">and device_type = #{deviceType}</if>
+            <if test="deviceType == null  || deviceType == ''">
+            and (device_type=3||device_type=13||device_type=15||device_type=16) and iot_device_id is not null
+            </if>
         </where>
     </select>
     <select id="selectDeviceParameterProperties" resultType="java.util.HashMap">