From 3a8e944ad60230ea56dcc5b49a57743f72930e1d Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Mon, 7 Oct 2024 20:55:52 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-135233=20=E8=B0=83=E6=95=B4DecisionOpera?=
 =?UTF-8?q?tor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/remote/ui/CustomRoleManagerPane.java | 14 ++++----------
 .../com/fr/design/remote/ui/UserManagerPane.java   | 13 ++++---------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/CustomRoleManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/CustomRoleManagerPane.java
index 3a0bc12672..a035153e5a 100644
--- a/designer-base/src/main/java/com/fr/design/remote/ui/CustomRoleManagerPane.java
+++ b/designer-base/src/main/java/com/fr/design/remote/ui/CustomRoleManagerPane.java
@@ -1,21 +1,15 @@
 package com.fr.design.remote.ui;
 
-import com.fine.theme.utils.FineUIUtils;
-import com.fr.design.border.UITitledBorder;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.remote.ui.list.AddedMemberListCellRender;
 import com.fr.design.remote.ui.list.AddingMemberListCellRender;
 import com.fr.design.remote.ui.list.cell.AddedCustomRoleListCellRender;
 import com.fr.design.remote.ui.list.cell.AddingCustomRoleListCellRender;
-import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.RemoteDesignMember;
-import com.fr.workspace.server.authority.decision.DecisionOperator;
+import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.border.EmptyBorder;
-import java.awt.BorderLayout;
+import javax.swing.*;
 import java.util.Collection;
 
 
@@ -64,11 +58,11 @@ public class CustomRoleManagerPane extends AbstractManagerPane {
 
     @Override
     protected Collection<RemoteDesignMember> getMembers(String userName, String keyWord){
-        return WorkContext.getCurrent().get(DecisionOperator.class).getCustoms(userName, keyWord);
+        return RemoteAuthorityRepository.getInstance().getCustoms(userName, keyWord, 1, 50);
     }
 
     @Override
     protected Collection<RemoteDesignMember> getMembers(String userName, String keyWord, int pageNum, int count){
-        return WorkContext.getCurrent().get(DecisionOperator.class).getCustoms(userName, keyWord, pageNum, count);
+        return RemoteAuthorityRepository.getInstance().getCustoms(userName, keyWord, pageNum, count);
     }
 }
diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java
index 25ab410615..963ddddd18 100644
--- a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java
+++ b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java
@@ -1,20 +1,15 @@
 package com.fr.design.remote.ui;
 
-import com.fr.design.border.UITitledBorder;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.remote.ui.list.AddedMemberListCellRender;
 import com.fr.design.remote.ui.list.AddingMemberListCellRender;
 import com.fr.design.remote.ui.list.cell.AddedUserListCellRender;
 import com.fr.design.remote.ui.list.cell.AddingUserListCellRender;
-import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.RemoteDesignMember;
-import com.fr.workspace.server.authority.decision.DecisionOperator;
+import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.border.EmptyBorder;
-import java.awt.BorderLayout;
+import javax.swing.*;
 import java.util.Collection;
 
 
@@ -63,11 +58,11 @@ public class UserManagerPane extends AbstractManagerPane {
 
     @Override
     protected Collection<RemoteDesignMember> getMembers(String userName, String keyWord){
-        return WorkContext.getCurrent().get(DecisionOperator.class).getMembers(userName, keyWord);
+        return RemoteAuthorityRepository.getInstance().getMembers(userName, keyWord, 1, 50);
     }
 
     @Override
     protected Collection<RemoteDesignMember> getMembers(String userName, String keyWord, int pageNum, int count){
-        return WorkContext.getCurrent().get(DecisionOperator.class).getMembers(userName, keyWord, pageNum, count);
+        return RemoteAuthorityRepository.getInstance().getMembers(userName, keyWord, pageNum, count);
     }
 }
\ No newline at end of file