fix(大屏):修改检验检测拆分后bug

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/EnterpriseBizMapper.xml

@@ -40,8 +40,8 @@
             <if test="tzBaseEnterpriseInfoDto.endCreateDate != null and tzBaseEnterpriseInfoDto.endCreateDate != ''">
                     AND create_date &lt;= #{tzBaseEnterpriseInfoDto.endCreateDate}
             </if>
-            <if test="tzBaseEnterpriseInfoDto.unitType.indexOf('检验机构') !=-1 OR tzBaseEnterpriseInfoDto.unitType.indexOf('检测机构') !=-1 and tzBaseEnterpriseInfoDto.jyjcStatus!=null and tzBaseEnterpriseInfoDto.jyjcStatus!=''">
-             use_unit_code in
+            <if test="(tzBaseEnterpriseInfoDto.unitType != null and (tzBaseEnterpriseInfoDto.unitType.contains('检验机构') or tzBaseEnterpriseInfoDto.unitType.contains('检测机构'))) and tzBaseEnterpriseInfoDto.jyjcStatus != null and tzBaseEnterpriseInfoDto.jyjcStatus != ''">
+            use_unit_code in
                 (select distinct unit_code from tz_jyjc_opening_application
                     where
                     status = #{tzBaseEnterpriseInfoDto.jyjcStatus}

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -100,7 +100,7 @@
 		COALESCE(use_unit_certificate, '身份证') AS useUnitCertificate
 		FROM
 		tz_base_enterprise_info
-		<if test=" tzBaseEnterpriseInfoDto.unitType.indexOf('检验机构') !=-1 OR tzBaseEnterpriseInfoDto.unitType.indexOf('检测机构') !=-1 ">
+		<if test=" tzBaseEnterpriseInfoDto.unitType.indexOf('检验机构') !=-1 or tzBaseEnterpriseInfoDto.unitType.indexOf('检测机构') !=-1 ">
 			JOIN (select unit_code,max(accept_date) from tz_jyjc_opening_application
 			where 1=1
 			<if test=" tzBaseEnterpriseInfoDto.jyjcStatus!=null and tzBaseEnterpriseInfoDto.jyjcStatus!='' ">