diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 8935a5621..ad5b01ce7 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -236,18 +236,13 @@ public class InterceptController extends CommonController{ noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport); noExportMap.put("PXY_INTERCEPT_PKT_BIN", interceptNoExport); List ipList=new ArrayList(); - List interInfoList=new ArrayList(); + List interInfoList=new ArrayList(); for (CfgIndexInfo cfg : page.getList()) { CfgIndexInfo cfgIndexInfo=interceptCfgService.exportIpInfo(cfg); ipList.addAll(cfgIndexInfo.getIpPortList()); interInfoList.addAll(cfgIndexInfo.getInterceptPktBinList()); } - if(interInfoList.size()>0){ - for (int i = 0; i < interInfoList.size(); i++) { - BaseStringCfg base=(BaseStringCfg)interInfoList.get(i); - base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); - } - } + interInfoList=replaceBaseList(interInfoList); dataMap.put(entity.getMenuNameCode(), page.getList()); dataMap.put("PXY_INTERCEPT_IP", ipList); dataMap.put("PXY_INTERCEPT_PKT_BIN", interInfoList); @@ -260,4 +255,12 @@ public class InterceptController extends CommonController{ } //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); } + + public static List replaceBaseList(List list){ + for (int i = 0; i < list.size(); i++) { + BaseStringCfg base=(BaseStringCfg)list.get(i); + base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); + } + return list; + } }