|
|
@@ -623,10 +623,12 @@
|
|
623
|
623
|
nvr.factory nvr_factory,
|
|
624
|
624
|
camera.channel_number,
|
|
625
|
625
|
camera.org_id,
|
|
626
|
|
- camera.camera_index_code cameraIndexCode
|
|
|
626
|
+ camera.camera_index_code cameraIndexCode,
|
|
|
627
|
+ s.storehouse_id storehouseId
|
|
627
|
628
|
FROM
|
|
628
|
629
|
monitor_camera camera
|
|
629
|
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
|
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
|
633
|
group by camera.id
|
|
632
|
634
|
</select>
|