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">