From f373fa1a3c30f516167ec1159fca50d4ebc85bda Mon Sep 17 00:00:00 2001 From: wangxin Date: Sun, 7 Oct 2018 20:19:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=95=8C=E9=9D=A2=E8=A1=8C?= =?UTF-8?q?=E4=B8=BA=E4=B8=80=E5=88=97=E9=83=A8=E5=88=86=E6=9C=AA=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/configuration/AppCfgController.java | 8 ++++---- .../configuration/EncryptedTunnelBehaviorController.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index afd5dbe8c..ad2149174 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -91,10 +91,10 @@ public class AppCfgController extends BaseController { second.setIsLeaf(1); List secondList=specificServiceCfgService.findAllSpecificServiceCfg(second, null); //遍历,找到匹配项后将行为设置进去 - for(SpecificServiceCfg secondCfg:secondList) { - if(secondCfg.getSpecServiceCode()==null) continue; - for(AppPolicyCfg entity:page.getList()){ - if(entity.getBehavCode()==null) continue; + for(AppPolicyCfg entity:page.getList()){ + if(entity.getBehavCode()==null) continue; + for(SpecificServiceCfg secondCfg:secondList) { + if(secondCfg.getSpecServiceCode()==null) continue; if(secondCfg.getSpecServiceCode().intValue()==entity.getBehavCode().intValue()) { entity.setBehavName(secondCfg.getSpecServiceName()); break; diff --git a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java index faac971b3..59c389960 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -66,10 +66,10 @@ public class EncryptedTunnelBehaviorController extends BaseController { second.setIsLeaf(1); List secondList=specificServiceCfgService.findAllSpecificServiceCfg(second, null); //遍历,找到匹配项后将行为设置进去 - for(SpecificServiceCfg secondCfg:secondList) { - if(secondCfg.getSpecServiceCode()==null) continue; - for(AppPolicyCfg entity:page.getList()){ - if(entity.getBehavCode()==null) continue; + for(AppPolicyCfg entity:page.getList()){ + if(entity.getBehavCode()==null) continue; + for(SpecificServiceCfg secondCfg:secondList) { + if(secondCfg.getSpecServiceCode()==null) continue; if(secondCfg.getSpecServiceCode().intValue()==entity.getBehavCode().intValue()) { entity.setBehavName(secondCfg.getSpecServiceName()); break;