diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 577c14546..85b0486e7 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -161,27 +161,18 @@ public class IpCfgService extends CrudService { List dictList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId()); int maatType=0; //判断下发类型是走maat还是callback - if(cfg.getCfgRegionCode()!=null){ - for(FunctionRegionDict f:dictList){ - if(f.getConfigRegionCode().intValue()==cfg.getCfgRegionCode()){ - maatType=f.getIsMaat(); - break; - } - } - }else{ - List maatServiceList = DictUtils.getDictList("MAAT_SERVICE"); - for(SysDataDictionaryItem maatService:maatServiceList){ - if(Integer.parseInt(maatService.getItemCode())==cfg.getServiceId().intValue()){ - for(FunctionRegionDict f:dictList){ - if(maatService.getItemValue().equals(f.getConfigRegionValue())){ - maatType=f.getIsMaat(); - break; - } + + List maatServiceList = DictUtils.getDictList("MAAT_SERVICE"); + for(SysDataDictionaryItem maatService:maatServiceList){ + if(Integer.parseInt(maatService.getItemCode())==cfg.getServiceId().intValue()){ + for(FunctionRegionDict f:dictList){ + if(maatService.getItemValue().equals(f.getConfigRegionValue())){ + maatType=f.getIsMaat(); + break; } - break; } + break; } - } if(cfg.getIsAudit()==Constants.AUDIT_YES){