From 1415f85b9f7218793db645f7890748fe148f81fa Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Mon, 16 Aug 2021 19:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/AuthorityToolBarPane.java    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
index 428a18a1a..1fc891c8b 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
@@ -185,7 +185,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
      */
     private void checkToolBarPaneEnable() {
         List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons();
-        boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role")) && !WorkContext.getCurrent().isRoot();
+        boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role"))&& !WorkContext.getCurrent().isRoot();
         for (ToolBarButton button : toolBarButtons) {
             button.setEnabled(!isnotEnable);
         }
@@ -296,15 +296,9 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
         if (toolBarManager.length == 0) {
             return;
         }
-        ToolBar resultToolbar = toolBarManager[0].getToolBar();
-        for (int i = 1; i < toolBarManager.length; i++) {
-            ToolBar toolBar = toolBarManager[i].getToolBar();
-            for (int j = 0; j < toolBar.getWidgetSize(); j++) {
-                Widget widget = toolBar.getWidget(j);
-                resultToolbar.addWidget(widget);
-            }
+        for (int i = 0; i < toolBarManager.length; i++) {
+            toolBarPane.populateBean(toolBarManager[i].getToolBar());
         }
-        toolBarPane.populateBean(resultToolbar);
     }