diff --git a/src/main/resources/mappers/iot/DeviceMapper.xml b/src/main/resources/mappers/iot/DeviceMapper.xml
index 6f4ad9c..d16c7d0 100644
--- a/src/main/resources/mappers/iot/DeviceMapper.xml
+++ b/src/main/resources/mappers/iot/DeviceMapper.xml
@@ -82,7 +82,7 @@
         where d.id = #{id}
     </select>
 
-    <select id="selectPageByConditions" resultType="com.zsc.edu.gateway.modules.iot.device.entity.Device">
+    <select id="selectPageByConditions" resultMap="BaseResultMap">
         SELECT d.*, p.*
         FROM iot_device d
         LEFT JOIN iot_product p ON d.product_id = p.id
@@ -96,7 +96,7 @@
             <if test="query.state != null and query.state  != ''">
                 AND d.state = #{query.state}
             </if>
-            <if test="query.isOnline != null and query.isOnline  != ''">
+            <if test="query.isOnline != null">
                 AND d.online = #{query.isOnline}
             </if>
             <if test="query.productId != null and query.productId  != ''">