Merge pull request #1250 in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0

* commit 'ac0c319ae4ee360205e06168af8049cff0d35961':
  REPORT-23115 远程设计权限配置-版本不匹配时用户角色列表都为空

designer-base/src/main/java/com/fr/design/file/NodeAuthProcessor.java

@@ -13,6 +13,7 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.AuthorityOperator;
 import com.fr.workspace.server.authority.decision.DecisionOperator;
 
+import java.lang.reflect.UndeclaredThrowableException;
 import java.util.ArrayList;
 
 public class NodeAuthProcessor {
@@ -41,9 +42,15 @@ public class NodeAuthProcessor {
         if (!WorkContext.getCurrent().isLocal()) {
             try {
                 String userName = WorkContext.getCurrent().getConnection().getUserName();
+                DesignAuthority[] authorities = null;
+                try {
                     String userId = WorkContext.getCurrent().get(DecisionOperator.class).getUserIdByName(userName);
+                    authorities = WorkContext.getCurrent().get(AuthorityOperator.class).getAuthorities(userId);
+                } catch(UndeclaredThrowableException e) {
+                    // 兼容旧版本的服务器
+                    authorities = WorkContext.getCurrent().get(AuthorityOperator.class).getAuthorities();
+                }
                 // 远程设计获取设计成员的权限列表
-                DesignAuthority[] authorities = WorkContext.getCurrent().get(AuthorityOperator.class).getAuthorities(userId);
                 DesignAuthority authority = null;
 
                 if (authorities != null) {

designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthManagerAction.java

@@ -9,11 +9,14 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.remote.ui.AuthorityManagerPane;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.DesignAuthority;
+import com.fr.report.constant.RoleType;
 import com.fr.stable.ArrayUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.AuthorityOperator;
 
 import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author yaohwu
@@ -38,13 +41,24 @@ public class RemoteDesignAuthManagerAction extends UpdateAction {
         if (!WorkContext.getCurrent().isLocal()) {
             try {
                 // 远程设计获取全部设计成员的权限列表
-                DesignAuthority[] userAuthorities = WorkContext.getCurrent().get(AuthorityOperator.class).getUserAuthorities();
-                DesignAuthority[] customAuthorities = WorkContext.getCurrent().get(AuthorityOperator.class).getCustomRoleAuthorities();
-                if (userAuthorities != null && userAuthorities.length != 0) {
-                    managerPane.populateByUser(userAuthorities);
+                DesignAuthority[] authorities = WorkContext.getCurrent().get(AuthorityOperator.class).getAuthorities();
+                List<DesignAuthority> userAuthorities = new ArrayList<DesignAuthority>();
+                List<DesignAuthority> customAuthorities = new ArrayList<DesignAuthority>();
+                if (authorities != null) {
+                    for (DesignAuthority authority : authorities) {
+                        if (authority.getRoleType() == RoleType.CUSTOM) {
+                            customAuthorities.add(authority);
+                        }
+                        else {
+                            userAuthorities.add(authority);
+                        }
+                    }
+                    if (userAuthorities.size() != 0) {
+                        managerPane.populateByUser(userAuthorities.toArray(new DesignAuthority[userAuthorities.size()]));
+                    }
+                    if (customAuthorities.size() != 0) {
+                        managerPane.populateByCustom(customAuthorities.toArray(new DesignAuthority[customAuthorities.size()]));
                     }
-                if (customAuthorities != null && customAuthorities.length != 0) {
-                    managerPane.populateByCustom(customAuthorities);
                 }
             } catch (Exception exception) {
                 FineLoggerFactory.getLogger().error(exception.getMessage(), exception);