From f22127c6da44bafae5447b0b24ddb33739ccaa4e Mon Sep 17 00:00:00 2001 From: Anner Date: Sun, 29 Sep 2024 09:57:33 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-135874=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E8=BF=9C=E7=A8=8B=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E8=84=B1=E6=95=8F=E8=A7=84=E5=88=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desensitization/model/UpdateDataWorker.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/UpdateDataWorker.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/UpdateDataWorker.java index d60e9a2c82..07e7571c93 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/UpdateDataWorker.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/UpdateDataWorker.java @@ -1,10 +1,8 @@ package com.fr.design.mainframe.cell.settingpane.desensitization.model; -import com.fr.base.operator.org.OrganizationOperator; -import com.fr.data.desensitize.rule.DesensitizationRuleManager; import com.fr.data.desensitize.rule.base.DesensitizationRule; import com.fr.data.desensitize.rule.base.DesensitizationRuleSource; -import com.fr.workspace.WorkContext; +import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository; import javax.swing.SwingWorker; import java.util.HashMap; @@ -26,8 +24,8 @@ public class UpdateDataWorker extends SwingWorker, Void> { @Override protected Map doInBackground() { Map result = new HashMap<>(); - Map allRoles = WorkContext.getCurrent().get(OrganizationOperator.class).getAllRoles4Desensitization(); - Map> allRules = DesensitizationRuleManager.getInstance().getAllRules(); + Map allRoles = RemoteAuthorityRepository.getInstance().getAllRoles4Desensitization(); + Map> allRules = RemoteAuthorityRepository.getInstance().getAllRoles().getSourceRuleMap(); result.put(ROLE_KEY, allRoles); result.put(RULE_KEY, allRules);