修改责任制管理人员统计

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -1547,12 +1547,11 @@ LEFT JOIN (
         SELECT DISTINCT
             u.sequence_nbr AS sequenceNbr,
             u.person_status AS personStatus,
-        cf.biz_org_Name AS bizOrgName,
-        cf.`name` AS `name`,
+            u.parent_name AS bizOrgName,
+            u.`biz_org_name` AS `name`,
             g.*
         FROM
             cb_org_usr u
-        LEFT JOIN cb_firefighters cf ON cf.org_usr_id = u.sequence_nbr
         LEFT JOIN (
         SELECT
         v.`instance_id`,
@@ -1571,7 +1570,7 @@ LEFT JOIN (
         ) g ON u.sequence_nbr = g.instance_id
         WHERE
         u.biz_org_type = 'person'
-        AND g.peopleType IN ('1601', '1602', '1603')
+        AND g.peopleType IN ('1601', '1602', '1603', '1604')
         AND u.is_delete = 0
         <if test="map.bizOrgCode != null and map.bizOrgCode != ''">
             AND  u.biz_org_code LIKE CONCAT(#{map.bizOrgCode}, '%')
@@ -1608,12 +1607,11 @@ LEFT JOIN (
                 SELECT DISTINCT
                 u.sequence_nbr AS sequenceNbr,
                 u.person_status AS personStatus,
-                    cf.biz_org_Name AS bizOrgName,
-                    cf.`name` AS `name`,
+                u.parent_name AS bizOrgName,
+                u.`biz_org_name` AS `name`,
                 g.*
                 FROM
                     cb_org_usr u
-                        LEFT JOIN cb_firefighters cf ON cf.org_usr_id = u.sequence_nbr
                         LEFT JOIN (
                         SELECT
                             v.`instance_id`,
@@ -1632,9 +1630,8 @@ LEFT JOIN (
                     ) g ON u.sequence_nbr = g.instance_id
                 WHERE
                     u.biz_org_type = 'person'
-                  AND g.peopleType IN ('1601', '1602', '1603')
+                  AND g.peopleType IN ('1601', '1602', '1603', '1604')
                   AND u.is_delete = 0
-                  AND cf.biz_org_name is not null
                 <if test="map.bizOrgCode != null and map.bizOrgCode != ''">
                     AND  u.biz_org_code LIKE CONCAT(#{map.bizOrgCode}, '%')
                 </if>