更改sql

src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.xml

@@ -607,7 +607,7 @@
       WHERE camera.isremove = '1' AND nvr.delete_mark = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR} AND nvr.org_id = #{orgid,jdbcType=VARCHAR}
     )a where rn = 1 -->
     
-    SELECT
+    <!-- SELECT
         camera.id camera_id,
         camera.alias,
         camera.factory,
@@ -631,6 +631,26 @@
       LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id
       LEFT JOIN camera_storehouse s on s.camera_id = camera.id
       WHERE camera.isremove = '1' AND nvr.delete_mark = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR} AND nvr.org_id = #{orgid,jdbcType=VARCHAR}
+    group by camera.id -->
+    
+    SELECT
+        camera.id camera_id,
+        camera.alias,
+        camera.factory,
+        camera.live,
+        camera.ip camera_ip,
+        camera.username camera_name,
+        camera.password camera_password,
+        camera.port camera_port,
+        camera.type camera_type,
+        camera.channel_number,
+        camera.org_id,
+        camera.camera_index_code cameraIndexCode,
+        s.storehouse_id storehouseId
+      FROM
+          monitor_camera camera
+      LEFT JOIN camera_storehouse s on s.camera_id = camera.id
+      WHERE camera.isremove = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR}
     group by camera.id
   </select>