动环设备分页接口代码提交

soc-modules/soc-modules-iot/src/main/resources/mapper/IotSensorMapper.xml

@@ -3,24 +3,24 @@
 <mapper namespace="com.xunmei.iot.mapper.IotCommonSensorMapper">
 
     <select id="selectPageData" resultType="com.xunmei.iot.vo.sensor.SensorPageVo">
-        select s.id, org_id, org_name, device_name, category_id, infos as info,device_code, update_time from iot_sensor s
-        <where>
-            <if test="request.orgId!= null">
-                and s.org_id=#{request.orgId}
-            </if>
-            <if test="request.orgPath!= null">
-                and s.org_path like CONCAT(#{request.orgPath}, '%')
-            </if>
-            <if test="request.deviceName != null and request.deviceName!= ''">
-                and s.device_name like CONCAT('%',#{request.deviceName},'%')
-            </if>
-            <if test="request.startTime!= null">
-                and s.state_update_time >=#{request.startTime}
-            </if>
-            <if test="request.endTime!= null">
-                and s.state_update_time <![CDATA[<=]]>  #{request.endTime}
-            </if>
-        </where>
+        select s.id, org_id, org_name, device_name, category_id, infos as info,device_code, update_time
+        from iot_sensor s
+        where s.deleted=0
+        <if test="request.orgId!= null">
+            and s.org_id=#{request.orgId}
+        </if>
+        <if test="request.orgPath!= null">
+            and s.org_path like CONCAT(#{request.orgPath}, '%')
+        </if>
+        <if test="request.deviceName != null and request.deviceName!= ''">
+            and s.device_name like CONCAT('%',#{request.deviceName},'%')
+        </if>
+        <if test="request.startTime!= null">
+            and s.state_update_time >=#{request.startTime}
+        </if>
+        <if test="request.endTime!= null">
+            and s.state_update_time <![CDATA[<=]]>  #{request.endTime}
+        </if>
     </select>
 
     <select id="selectSensorLogDataPage" resultType="com.xunmei.iot.vo.sensor.SensorPageVo">