1

src/main/resources/mapper/agent/CameraMapper.xml

@@ -10,7 +10,8 @@
         left join t_user u on d.user_id = u.id
         left join t_user_increment ui on d.camera_id = ui.camera_id
         left join t_increment_type uit on ui.increment_type_id = uit.id
-        where c.rec_status = 'A' and d.agent_id = #{param.agentId}
+        where c.rec_status = 'A' and (ui.rec_status = 'A' or ui.rec_status is null)
+        and d.agent_id = #{param.agentId}
         <if test="param.userId !=null ">
             and d.user_id = #{param.userId}
         </if>