From 18c43123b51a1688ab4ae01fe3d171c7d92e619b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期四, 16 一月 2025 18:19:34 +0800
Subject: [PATCH] 1、调整会话过期提示 2、流程设计器隐藏拓展按钮，隐藏右下角图标
---
Source/Service/FrameService/src/com/vci/server/framework/delegate/RoleRightDelegate.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Source/Service/FrameService/src/com/vci/server/framework/delegate/RoleRightDelegate.java b/Source/Service/FrameService/src/com/vci/server/framework/delegate/RoleRightDelegate.java
index a0c829b..a166a60 100644
--- a/Source/Service/FrameService/src/com/vci/server/framework/delegate/RoleRightDelegate.java
+++ b/Source/Service/FrameService/src/com/vci/server/framework/delegate/RoleRightDelegate.java
@@ -4,21 +4,20 @@
import java.util.Date;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-
-import com.vci.common.log.LogType;
import com.vci.common.log.ServerWithLog4j;
import com.vci.common.utility.ObjectUtility;
import com.vci.corba.common.VCIError;
import com.vci.corba.framework.data.RoleRightInfo;
+import com.vci.corba.log.data.LogType;
import com.vci.corba.common.data.UserEntityInfo;
-import com.vci.corba.framework.data.UserInfo;
+import com.vci.corba.framework.data.RoleInfo;
import com.vci.server.base.delegate.BaseDelegate;
+import com.vci.server.base.utility.LogRecordUtil;
+import com.vci.server.cache.OrgCacheProvider;
import com.vci.server.framework.funcmng.function.Function;
import com.vci.server.framework.funcmng.function.FunctionService;
import com.vci.server.framework.right.roleRight.RoleRight;
import com.vci.server.framework.right.roleRight.RoleRightService;
-import com.vci.server.framework.systemConfig.log.LogRecordUtil;
import com.vci.server.framework.systemConfig.stafforgmanage.role.Role;
import com.vci.server.framework.systemConfig.stafforgmanage.role.RoleService;
@@ -70,7 +69,8 @@
//roleRights[i].setRightType(rightType);
}
- Role role = roleService.selectRole(roleId);
+ RoleInfo role = OrgCacheProvider.getRole(roleId);
+ //Role role = OrgCacheProvider.getRole(roleId);
if (roleRights.length > 0) {
res = service.saveRoleRight(roleRights, roleId, rightType);
try {
@@ -88,15 +88,15 @@
}
}
sb.append("绛夊叡璁�" + roleRightInfos.length + "涓潈闄�");
- logInfo = "鎿嶄綔鐨勮鑹蹭俊鎭负:" + role.getLogInfo() + ",鏉冮檺鍖呮嫭:" + sb.toString();
+ logInfo = "鎿嶄綔鐨勮鑹蹭俊鎭负:瑙掕壊[" + role.name + "],鏉冮檺鍖呮嫭:" + sb.toString();
} else {
- logInfo = "鎿嶄綔鐨勮鑹蹭俊鎭负:" + role.getLogInfo();
+ logInfo = "鎿嶄綔鐨勮鑹蹭俊鎭负:瑙掕壊[" + role.name + "]";
}
if (res)
- LogRecordUtil.writeLog(userEntity, "鎺堟潈", "鎴愬姛", logInfo, LogType.GrantPrivileges, role.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "鎺堟潈", "鎴愬姛", logInfo, LogType.Grant, role.id);
else
- LogRecordUtil.writeLog(userEntity, "鎺堟潈", "澶辫触", logInfo, LogType.GrantPrivileges, role.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "鎺堟潈", "澶辫触", logInfo, LogType.Grant, role.id);
} catch (Exception e) {
//e.printStackTrace();
@@ -106,7 +106,7 @@
} catch (Exception e) {
//e.printStackTrace();
ServerWithLog4j.logger.error(e);
- LogRecordUtil.writeLog(userEntity, "鎺堟潈", "鍔熻兘妯″潡鎺堟潈澶辫触锛�", e.getMessage(), LogType.GrantPrivileges, roleId);
+ LogRecordUtil.writeLog(userEntityInfo, "鎺堟潈", "鍔熻兘妯″潡鎺堟潈澶辫触锛�", e.getMessage(), LogType.Grant, roleId);
throw new VCIError("0", new String[] { e.getMessage() });
}
return res;
@@ -150,16 +150,16 @@
res = service.removeRoleRight(roleRights, roleId);
if (res)
- LogRecordUtil.writeLog(userEntity, "鎺堟潈", "鎴愬姛", role.getLogInfo(), LogType.GrantPrivileges, role.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "鎺堟潈", "鎴愬姛", role.getLogInfo(), LogType.Grant, role.getId());
else
- LogRecordUtil.writeLog(userEntity, "鎺堟潈", "澶辫触", role.getLogInfo(), LogType.GrantPrivileges, role.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "鎺堟潈", "澶辫触", role.getLogInfo(), LogType.Grant, role.getId());
}
} catch (Exception e) {
//e.printStackTrace();
ServerWithLog4j.logger.error(e);
// LogRecordUtil.writeLog(userEntity, "鎺堟潈",
- // "鍔熻兘妯″潡鎺堟潈澶辫触锛�",LogType.GrantPrivileges);
+ // "鍔熻兘妯″潡鎺堟潈澶辫触锛�",LogType.Grant);
throw new VCIError("0", new String[0]);
}
return res;
@@ -201,12 +201,12 @@
Role role = roleService.selectRole(roleId);
res = service.reAddRoleRight(roleRights, roleId, rightType);
- LogRecordUtil.writeLog(userEntity, "澧炲姞鎺堟潈", "鎴愬姛", role.getLogInfo(), LogType.GrantPrivileges, role.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "澧炲姞鎺堟潈", "鎴愬姛", role.getLogInfo(), LogType.Grant, role.getId());
} catch (Exception e) {
//e.printStackTrace();
ServerWithLog4j.logger.error(e);
// LogRecordUtil.writeLog(userEntity, "鎺堟潈",
- // "鍔熻兘妯″潡鎺堟潈澶辫触锛�",LogType.GrantPrivileges);
+ // "鍔熻兘妯″潡鎺堟潈澶辫触锛�",LogType.Grant);
throw new VCIError("0", new String[0]);
}
return res;
@@ -239,14 +239,14 @@
Role role = roleService.selectRole(roleId);
res = service.reAddRoleRightWithNoCheck(roleRights, rightType);
if (res)
- LogRecordUtil.writeLog(userEntity, "澧炲姞鎺堟潈", "鎴愬姛", role.getLogInfo(), LogType.GrantPrivileges, role.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "澧炲姞鎺堟潈", "鎴愬姛", role.getLogInfo(), LogType.Grant, role.getId());
else
- LogRecordUtil.writeLog(userEntity, "澧炲姞鎺堟潈", "澶辫触", role.getLogInfo(), LogType.GrantPrivileges, role.getId());
+ LogRecordUtil.writeLog(userEntityInfo, "澧炲姞鎺堟潈", "澶辫触", role.getLogInfo(), LogType.Grant, role.getId());
} catch (Exception e) {
//e.printStackTrace();
ServerWithLog4j.logger.error(e);
// LogRecordUtil.writeLog(userEntity, "鎺堟潈",
- // "鍔熻兘妯″潡鎺堟潈澶辫触锛�",LogType.GrantPrivileges);
+ // "鍔熻兘妯″潡鎺堟潈澶辫触锛�",LogType.Grant);
throw new VCIError("0", new String[0]);
}
return res;
--
Gitblit v1.9.3