1.规则3.0自测bug修改

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/action/RuleActionHandler.java

@@ -53,8 +53,7 @@ public class RuleActionHandler {
 
 
     public RuleActionHandler(EmqKeeper emqKeeper, TzBaseUnitLicenceMapper baseUnitLicenceMapper,
-                             TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper,
-                             RuleCommonServiceImpl ruleCommonService, RedissonClient redissonClient, RedisUtils redisUtils) {
+                             TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper, RedissonClient redissonClient, RedisUtils redisUtils) {
         this.emqKeeper = emqKeeper;
         this.baseUnitLicenceMapper = baseUnitLicenceMapper;
         this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper;
@@ -170,7 +169,10 @@ public class RuleActionHandler {
         // 第三方时需要去掉法定机构
         if (inspectionCompanyType.equals(InspectionCompanyType.THIRD.getCode())) {
             log.info("第三方检验机构开始匹配");
+            //目前规则配置的法定名单为陕西省内地市的法定机构
             matchEnterpriseInfos = matchEnterpriseInfos.stream().filter(e -> !legalInspectionCodes.contains(e.getUseCode())).collect(Collectors.toList());
+            // 还需要去掉定向的机构：陕西省、国机特种设备检验有限公司、中国特种设备检验检测研究院
+            matchEnterpriseInfos = matchEnterpriseInfos.stream().filter(c -> !specialInspectionCompanyCode.contains(c.getUseCode())).collect(Collectors.toList());
             log.info("匹配到的第三方检验机构：{}", matchEnterpriseInfos);
         }
         // 法定时，机构为定义的法定机构 defaultInspectionCode