From ecb03a7391a1e9659f6a09dfcce40b769a18aa43 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 12 Sep 2018 21:31:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AEapp=20name=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/configuration/AppCfgController.java | 4 +++- .../controller/configuration/BasicProtocolController.java | 5 ++++- .../configuration/EncryptedTunnelBehaviorController.java | 4 +++- 3 files changed, 10 insertions(+), 3 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 8af5ac660..7fe6cc4ed 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -75,7 +75,9 @@ public class AppCfgController extends BaseController { Page page = appCfgService.findAppPolicyList(searchPage, cfg); for(AppPolicyCfg entity:page.getList()){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId()); - entity.setAppName(app.getSpecServiceName()); + if(app!=null) { + entity.setAppName(app.getSpecServiceName()); + } } //查找社交应用的所有有效二级特定服务 SpecificServiceCfg second=new SpecificServiceCfg(); diff --git a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java index 707b91367..3f063a718 100644 --- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java +++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java @@ -48,7 +48,10 @@ public class BasicProtocolController extends BaseController { Page page = appCfgService.findAppPolicyList(searchPage, cfg); for(AppPolicyCfg entity:page.getList()){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId()); - entity.setAppName(app.getSpecServiceName()); + if(app!=null) { + entity.setAppName(app.getSpecServiceName()); + } + } model.addAttribute("page", page); initPageCondition(model,cfg); 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 3f08acd68..faac971b3 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -50,7 +50,9 @@ public class EncryptedTunnelBehaviorController extends BaseController { Page page = appCfgService.findAppPolicyList(searchPage, cfg); for(AppPolicyCfg entity:page.getList()){ SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId()); - entity.setAppName(app.getSpecServiceName()); + if(app!=null) { + entity.setAppName(app.getSpecServiceName()); + } } //查找社交应用的所有有效二级特定服务 SpecificServiceCfg second=new SpecificServiceCfg();