Merge remote-tracking branch 'origin/develop_bugfix@dl' into develop_bugfix@dl

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

@@ -2941,10 +2941,10 @@
             IFNULL(IF(a.shbz_img IS NOT NULL, a.shbz_img, a.img), '') AS icon
         FROM
             wl_equipment_specific wes
-            LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8, 9)) a ON a.`code` = wes.equipment_code
+            LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id, is_iot FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8, 9)) a ON a.`code` = wes.equipment_code
             LEFT JOIN wl_unit wu ON wu.id = a.unit_id
         WHERE
-            a.`name` IS NOT NULL
+            a.`name` IS NOT NULL AND a.is_iot = 0
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 AND wes.biz_org_code like concat (#{bizOrgCode},'%')
             </if>
@@ -2962,9 +2962,9 @@
             wes.equip_status AS equipStatus
         FROM
             wl_equipment_specific wes
-            LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8, 9)) a ON a.`code` = wes.equipment_code
+            LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id, is_iot FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8, 9)) a ON a.`code` = wes.equipment_code
         <where>
-            a.name IS NOT NULL
+            a.name IS NOT NULL AND a.is_iot = 0
             <if test="code != null and code != ''">
                 AND wes.equipment_code = #{code}
             </if>
@@ -2984,9 +2984,9 @@
             count(1)
         FROM
         wl_equipment_specific wes
-        LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8, 9)) a ON a.`code` = wes.equipment_code
+        LEFT JOIN (SELECT id, `code`, `name`, img, shbz_img, unit_id, is_iot FROM wl_equipment WHERE LEFT(`code`, 1) IN (1, 3, 4, 5, 6, 7, 8, 9)) a ON a.`code` = wes.equipment_code
         <where>
-            a.name IS NOT NULL
+            a.name IS NOT NULL AND a.is_iot = 0
             <if test="code != null and code != ''">
                 AND wes.equipment_code = #{code}
             </if>

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

@@ -7368,6 +7368,7 @@
         FROM
             wl_equipment
         <where>
+            is_iot = 0 AND
             <if test="collect != null and collect.size > 0">
                 code IN
                 <foreach collection="collect" item="item" index="index" open="(" close=")" separator=",">
@@ -7406,6 +7407,7 @@
         FROM
         wl_equipment
         <where>
+            is_iot = 0 AND
             <if test="collect != null and collect.size > 0">
                 code NOT IN
                 <foreach collection="collect" item="item" index="index" open="(" close=")" separator=",">
@@ -7437,7 +7439,7 @@
         LEFT JOIN wl_equipment_category cate ON cate.id = wle.category_id
         LEFT JOIN wl_unit as unit ON wle.unit_id = unit.id
         <where>
-            wle.code in
+            wle.is_iot = 0 AND wle.code in
             <foreach collection="codes" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>