From 4713174ac10b10e1eabf13106f121d604974d8e1 Mon Sep 17 00:00:00 2001
From: rinoux <rinoux@foxmail.com>
Date: Thu, 24 Aug 2017 14:55:24 +0800
Subject: [PATCH] sonarCube2

---
 .../fr/design/mainframe/AuthorityToolBarPane.java  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java b/designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java
index 44125ce1b2..682ddc3081 100644
--- a/designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java
+++ b/designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java
@@ -215,7 +215,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
         ReportWebAttr rw = wbTpl.getReportWebAttr();
         ConfigManagerProvider cm = ConfigManager.getProviderInstance();
         ReportWebAttr webAttr = ((ReportWebAttr) cm.getGlobalAttribute(ReportWebAttr.class));
-        if (webAttr == null) {
+        if (webAttr == null || rw == null || rw.getWebPage() == null) {
             return;
         }
 
@@ -224,19 +224,13 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
         //看是存在服务器还存在模板里面
         if (choseComboBox.getSelectedIndex() == 0) {
             //分页
-            if (rw == null || rw.getWebPage() == null) {
-                dealWithWebContent(webAttr.getWebPage(), widget, isSelected, selectedRole);
-            }
+            dealWithWebContent(webAttr.getWebPage(), widget, isSelected, selectedRole);
         } else if (choseComboBox.getSelectedIndex() == 1) {
             //填报
-            if (rw == null || rw.getWebPage() == null) {
-                dealWithWebContent(webAttr.getWebWrite(), widget, isSelected, selectedRole);
-            }
+            dealWithWebContent(webAttr.getWebWrite(), widget, isSelected, selectedRole);
         } else {
             //view
-            if (rw == null || rw.getWebPage() == null) {
-                dealWithWebContent(webAttr.getWebView(), widget, isSelected, selectedRole);
-            }
+            dealWithWebContent(webAttr.getWebView(), widget, isSelected, selectedRole);
         }
     }