From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java
index 7403ec3..2037c31 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/RightControlUtil.java
@@ -1,6 +1,5 @@
package com.vci.web.util;
-import com.vci.client.common.objects.RoleObject;
-import com.vci.common.exception.VciException;
+
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.FunctionInfo;
import com.vci.corba.framework.data.RoleInfo;
@@ -118,7 +117,7 @@
public boolean isThreeAdminCurUser() {
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
try {
- RoleInfo[] roles = platformClientUtil.getFrameworkService().fetchRoleInfoByUserId(sessionInfo.getUserId());
+ RoleInfo[] roles = platformClientUtil.getFrameworkService().fetchRoleInfoByUserId(sessionInfo.getUserOid());
for (RoleInfo role : roles) {
if (role.name.equalsIgnoreCase("绯荤粺绠＄悊鍛�")){
return true;
@@ -152,7 +151,6 @@
}
return roleRightByUserName;
}
-
/**
* 鑾峰彇褰撳墠鐢ㄦ埛鍏锋湁鏉冮檺鐨勬墍鏈夋ā鍧�
@@ -231,7 +229,6 @@
public FunctionInfo[] getFunctionsByParentId(String parentId, String userName) {
-
FunctionInfo[] funcObjs = null;
try {
if(isDeveloper(userName)){
--
Gitblit v1.9.3