Merge remote-tracking branch 'origin/develop_dl_plan6_temp' into develop_dl_plan6_temp

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrganizationMapper.xml

@@ -40,23 +40,6 @@
             '当值值长' AS name UNION
         (
         SELECT
-            (
-            SELECT
-            count( 1 ) AS num
-            FROM
-            cb_org_usr cou
-            LEFT JOIN cb_dynamic_form_instance cdfi ON cou.sequence_nbr = cdfi.instance_id
-            WHERE
-            cou.biz_org_type = 'PERSON'
-            AND cdfi.field_code = 'peopleType'
-            AND field_value = '1601'
-            AND cou.is_delete = 0
-            AND cou.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
-            ) AS `value`,
-            '驻站消防队' AS name
-            ) UNION
-        (
-        SELECT
             ( SELECT COUNT( 1 ) FROM cb_organization_user cou WHERE cou.emergency_team_id = co.sequence_nbr ) AS
             value
                 ,
@@ -66,7 +49,7 @@
         WHERE co.is_delete = 0
         ORDER BY
             co.sort desc
-            LIMIT 4
+            LIMIT 5
             )
     </select>
     <select id="getOrganizationList" resultType="java.util.Map">