修改代码

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -219,7 +219,16 @@
         join wl_equipment as equ on eqdet.equipment_id = equ.id
         join wl_equipment_category as cat on equ.category_id = cat.id
         where det.amount > 0
-        and spe.single = true) as da
+        and spe.single = true
+        <if test="instanceId != null and instanceId !=''">
+        and  stru.id IN
+         (  select id from wl_warehouse_structure where parent_id in(
+            select id from wl_warehouse_structure where parent_id = #{instanceId})
+            union
+            select id from wl_warehouse_structure where parent_id = #{instanceId}or
+            id = #{instanceId} )
+        </if>
+            ) as da
         <if test="id != null  and  id !=''">
             where find_in_set(#{id}, da.equipSyetemId)
         </if>
@@ -253,6 +262,15 @@
             wl_video AS vid
             JOIN wl_video_source AS vis ON vid.id = vis.video_id
             JOIN wl_warehouse_structure AS stru ON stru.id = vis.source_id
+            WHERE
+            stru.id IN
+            (
+            select id from wl_warehouse_structure where parent_id in(
+            select id from wl_warehouse_structure where parent_id = #{instanceId})
+            union
+            select id from wl_warehouse_structure where parent_id = #{instanceId}or
+            id = #{instanceId}
+            )
         </if>
     </select>
     <select id="get3dPointData" resultType="com.yeejoin.equipmanage.common.entity.vo.PointTreeVo">