gaodd 1 rok temu
rodzic
commit
177935beed

+ 3 - 1
src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.xml

@@ -623,10 +623,12 @@
623
         nvr.factory nvr_factory,
623
         nvr.factory nvr_factory,
624
         camera.channel_number,
624
         camera.channel_number,
625
         camera.org_id,
625
         camera.org_id,
626
-        camera.camera_index_code cameraIndexCode
626
+        camera.camera_index_code cameraIndexCode,
627
+        s.storehouse_id storehouseId
627
       FROM
628
       FROM
628
           monitor_camera camera
629
           monitor_camera camera
629
       LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id
630
       LEFT JOIN monitor_nvr nvr ON nvr.id = camera.nvr_id
631
+      LEFT JOIN camera_storehouse s on s.camera_id = camera.id
630
       WHERE camera.isremove = '1' AND nvr.delete_mark = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR} AND nvr.org_id = #{orgid,jdbcType=VARCHAR}
632
       WHERE camera.isremove = '1' AND nvr.delete_mark = '1' AND camera.org_id = #{orgid,jdbcType=VARCHAR} AND nvr.org_id = #{orgid,jdbcType=VARCHAR}
631
     group by camera.id
633
     group by camera.id
632
   </select>
634
   </select>