人员bug修改

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

@@ -411,8 +411,61 @@
         AND fp.is_delete = 0
                 AND concat( fp.post_qualification_code, ',' ) REGEXP concat( REPLACE ( '1431', ',', ',|' ), ',' ) > 0
                 <if test='bizOrgCode!=null and bizOrgCode!=""'>and LEFT(a.biz_org_code,18) like concat (#{bizOrgCode},'%')</if>
-                ) AS ejjzjgxfjsNum
-            )
+                ) AS ejjzjgxfjsNum,
+                (
+                SELECT
+                count( 1 ) AS qtNum
+                FROM
+                (
+                SELECT
+                *
+                FROM
+                (
+                SELECT
+                ou.sequence_nbr,
+                ou.biz_org_type,
+                ou.biz_org_name,
+                ou.biz_org_code,
+                IFNULL( MAX( CASE WHEN cfi.field_code = 'peopleType' THEN field_value END ), '' ) AS peopleType,
+                ou.is_delete
+                FROM
+                cb_org_usr ou
+                LEFT JOIN cb_dynamic_form_instance cfi ON ou.sequence_nbr = cfi.instance_id
+                WHERE
+                ou.is_delete = '0'
+                GROUP BY
+                ou.sequence_nbr
+                ) c
+                WHERE
+                c.peopleType = '1602'
+                ) a
+                LEFT JOIN cb_firefighters_post fp ON a.sequence_nbr = fp.org_usr_id
+                WHERE
+                a.biz_org_name IS NOT NULL
+                AND a.is_delete = 0
+                AND a.biz_org_type = 'PERSON'
+                AND fp.is_delete = 0
+                AND REPLACE (
+                REPLACE (
+                REPLACE ( REPLACE ( REPLACE ( REPLACE ( fp.post_qualification_code, ',', '' ), '1427', '' ), '1428', '' ), '1429', '' ),
+                '1430',
+                ''
+                ),
+                '1431',
+                ''
+                ) IS NOT NULL
+                AND REPLACE (
+                REPLACE (
+                REPLACE ( REPLACE ( REPLACE ( REPLACE ( fp.post_qualification_code, ',', '' ), '1427', '' ), '1428', '' ), '1429', '' ),
+                '1430',
+                ''
+                ),
+                '1431',
+                ''
+                ) != ''
+        <if test='bizOrgCode!=null and bizOrgCode!=""'>and LEFT(a.biz_org_code,18) like concat (#{bizOrgCode},'%')</if>
+                        ) as qtNum
+                    )
     </select>
 
     <select id="getZZPersonInfo" resultType="Map">

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

@@ -1724,7 +1724,9 @@
 
     <select id="getCenterPersonInfoPage" resultType="Map">
         SELECT
-        a.biz_org_code AS bizOrgCode,
+        LEFT (
+        a.biz_org_code,
+        18) AS bizOrgCode,
         (
         CASE
         WHEN LENGTH( a.biz_org_code ) > 18 THEN
@@ -1839,7 +1841,7 @@
         AND a.is_delete = 0
         AND a.biz_org_type = 'PERSON'
         AND fp.is_delete = 0
-        AND LEFT ( a.biz_org_code, 18 ) LIKE concat ( 'LSHLZ1wYXL3mJmHZyG', '%' )
+        AND LENGTH( a.biz_org_code ) = 18
         <if test='bizOrgCode!=null and bizOrgCode!=""'>
             and LEFT(a.biz_org_code,18) like concat (#{bizOrgCode},'%')
         </if>