Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml

@@ -32,7 +32,6 @@
         equ.code as code,
         det.name as name,
         cate.name as type,
-        if(fire.fire_equipment_id is null ,'NO','YES') as isbind,
         ware.full_name as address,
         spe.single as single,
         sto.amount as amount,
@@ -43,11 +42,13 @@
         from
         wl_stock_detail as sto
         left join wl_equipment_specific as spe on sto.qr_code = spe.qr_code
+        <if test="equipmentId != null and equipmentId!='null' ">
+            left join f_equipment_fire_equipment as fire on spe.id = fire.fire_equipment_id
+        </if>
         left join wl_warehouse_structure as ware on sto.warehouse_structure_id  = ware .id
         left join wl_equipment_detail as det on sto.equipment_detail_id = det.id
         left join wl_equipment as equ on det.equipment_id = equ.id
         left join wl_equipment_category as cate on equ.category_id = cate.id
-        left join f_equipment_fire_equipment as fire on spe.id = fire.fire_equipment_id
         left join f_equipment_manage as manage on spe.system_id = manage.SEQUENCE_NBR
         where sto.amount <![CDATA[>]]> 0
         <if test="name != null and name!='null' ">