From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/Client/PLTClient/src/com/vci/client/auth2/utils/RightManagerHelper.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Source/Client/PLTClient/src/com/vci/client/auth2/utils/RightManagerHelper.java b/Source/Client/PLTClient/src/com/vci/client/auth2/utils/RightManagerHelper.java
index 74ff340..7627676 100644
--- a/Source/Client/PLTClient/src/com/vci/client/auth2/utils/RightManagerHelper.java
+++ b/Source/Client/PLTClient/src/com/vci/client/auth2/utils/RightManagerHelper.java
@@ -55,7 +55,7 @@
 import com.vci.common.qt.object.Symbol;
 //import com.vci.corba.auth2.Auth2ServicePrx;
 import com.vci.corba.framework.data.GrandValue;
-import com.vci.corba.framework.method.FrameworkServicePrx;
+import com.vci.corba.framework.FrameworkServicePrx;
 import com.vci.corba.common.VCIError;
 import com.vci.corba.omd.btm.BtmItem;
 import com.vci.corba.omd.lcm.LifeCycle;
@@ -66,20 +66,20 @@
 import com.vci.corba.portal.data.PLAction;
 
 public class RightManagerHelper {
-	private static FrameworkServicePrx frameService = null;
-
-	public static FrameworkServicePrx getFrameworkService() throws VCIError {
-		if (frameService != null) {
-			return frameService;
-		}
-		try {
-
-			return frameService = ServiceProvider.getFrameService();
-		} catch (Exception e) {
-			ClientLog4j.logger.error(e.getMessage(), e);
-			throw new VCIError("1", new String[] { e.getMessage() });
-		}
-	}
+//	private static FrameworkServicePrx frameService = null;
+//
+//	public static FrameworkServicePrx getFrameworkService() throws VCIError {
+//		if (frameService != null) {
+//			return frameService;
+//		}
+//		try {
+//
+//			return frameService = ServiceProvider.getFrameService();
+//		} catch (Exception e) {
+//			ClientLog4j.logger.error(e.getMessage(), e);
+//			throw new VCIError("1", new String[] { e.getMessage() });
+//		}
+//	}
 
 
 	public static BtmItem getResourceType(AbstractUIFunclet funclet) {
@@ -103,7 +103,7 @@
 	public static GrandValue[] getRightDatas(String typeName) {
 		GrandValue[] dataSets = null;
 		try {
-			dataSets = getFrameworkService().queryGrand(typeName);
+			dataSets = ServiceProvider.getFrameService().queryGrand(typeName);
 		} catch (Throwable e) {
 			JOptionPane.showMessageDialog(LogonApplication.frame,
 					((VCIError) e).messages[0], "閿欒鎻愮ず", JOptionPane.ERROR_MESSAGE);

--
Gitblit v1.9.3