11608

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

@@ -4538,7 +4538,6 @@
         select * from (
         (SELECT
         r.`name`,
-        ou.`code`,
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
         (
@@ -4585,12 +4584,9 @@
         IFNULL( rp.volume, 0 ) AS volume,
         ec.image,
         r.resource_type,
-        r.sequence_nbr,
-        fs.`code` AS systemCode
+        r.sequence_nbr
         FROM
         cb_water_resource r
-        LEFT JOIN cb_org_usr ou ON ou.biz_org_code = r.biz_org_code
-        AND ou.is_delete = 0
         LEFT JOIN cb_water_resource_pool rp ON rp.resource_id = r.sequence_nbr
         LEFT JOIN wl_equipment_specific_index ei ON ei.equipment_specific_id = rp.level_device_id
         LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id
@@ -4598,7 +4594,7 @@
         WHERE
         r.resource_type = 'industryPool'
         AND r.is_delete = 1
-        AND ou.`code` IS NOT NULL
+        AND r.`biz_org_code` IS NOT NULL
         <if test="bizOrgCode!=null and bizOrgCode!=''">
             AND r.biz_org_code like concat(#{bizOrgCode}, '%')
         </if>
@@ -4607,7 +4603,6 @@
         (
         SELECT
         a.`name`,
-        a.`code`,
         a.minLevel,
         a.maxLevel,
         (
@@ -4654,13 +4649,11 @@
         a.volume,
         a.image,
         a.resource_type,
-        a.sequence_nbr,
-        a.`code` AS systemCode
+        a.sequence_nbr
         FROM
         (
         SELECT
         r.`name`,
-        ou.`code`,
         IFNULL( rp.min_water_level, 0 ) AS minLevel,
         IFNULL( rp.max_water_level, 0 ) AS maxLevel,
         (select
@@ -4674,19 +4667,16 @@
         ec.image,
         r.resource_type,
         r.sequence_nbr,
-        rp.level_device_id,
-        fs.`code` AS systemCode
+        rp.level_device_id
         FROM
         cb_water_resource r
-        LEFT JOIN cb_org_usr ou ON ou.biz_org_code = r.biz_org_code
-        AND ou.is_delete = 0
         LEFT JOIN cb_water_resource_pool rp ON rp.resource_id = r.sequence_nbr
         LEFT JOIN wl_equipment_category ec ON ec.id = r.equip_category_id
         LEFT JOIN f_fire_fighting_system fs ON fs.id = r.belong_fighting_system_id
         WHERE
         r.resource_type = 'pool'
         AND r.is_delete = 1
-        AND ou.`code` IS NOT NULL
+        AND r.`biz_org_code` IS NOT NULL
         <if test="bizOrgCode!=null and bizOrgCode!=''">
             AND r.biz_org_code like concat(#{bizOrgCode}, '%')
         </if>
@@ -4893,7 +4883,9 @@
                 WHERE
                     ed.`code` LIKE '92011000%'
 <!--                  AND es.iot_code IS NOT NULL-->
-                  AND es.biz_org_code like concat(#{bizOrgCode}, '%')
+                    <if test="bizOrgCode!=null and bizOrgCode!=''">
+                        AND r.biz_org_code like concat(#{bizOrgCode}, '%')
+                    </if>
                 GROUP BY
                     es.id
             ) a