1.企业详情已有bug修改

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -212,15 +212,8 @@ public class TzBaseEnterpriseInfoServiceImpl
 		if ("监管机构".equals(companyType)) {
 			unitLicencesCollect = unitLicences;
 		} else {
-			Predicate<BaseUnitLicence> certTypePredicate;
-			if (INSPECTION_AND_TESTING_INSTITUTIONS.equals(companyType)) {
-				certTypePredicate = baseUnitLicence -> INSPECTION_AGENCY.equals(baseUnitLicence.getCertType()) ||
-						TESTING_INSTITUTIONS.equals(baseUnitLicence.getCertType());
-			} else {
-				certTypePredicate = baseUnitLicence -> companyType.contains(baseUnitLicence.getCertType());
-			}
 			unitLicencesCollect = unitLicences.stream()
-					.filter(certTypePredicate)
+					.filter(baseUnitLicence -> COMPANY_TYPE_CERT_TYPE_MAP.get(companyType).contains((baseUnitLicence.getCertTypeCode())))
 					.collect(Collectors.toList());
 		}
 		if (!ValidationUtil.isEmpty(unitLicencesCollect)) {