瀏覽代碼

增加云文件角色

o2sword 5 年之前
父節點
當前提交
f852c3846e

+ 4 - 1
o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java

@@ -74,6 +74,9 @@ public class OrganizationDefinition {
 	public final static String SearchPrivilege = "SearchPrivilege";
 	public final static String SearchPrivilege_description = "搜索管理员(系统角色),可以跨权限对系统内容进行搜索。";
 
+	public final static String FileManager = "FileManager";
+	public final static String FileManager_description = "云文件管理员(系统角色),可以进行云文件系统相关配置。";
+
 	public final static String RoleDefinitionSuffix = "SystemRole";
 
 	public final static Pattern person_distinguishedName_pattern = Pattern.compile("^(.+)\\@(\\S+)\\@P$");
@@ -97,7 +100,7 @@ public class OrganizationDefinition {
 	public final static List<String> DEFAULTROLES = new UnmodifiableList<String>(ListTools.toList(Manager,
 			AttendanceManager, OrganizationManager, PersonManager, GroupManager, UnitManager, RoleManager,
 			ProcessPlatformManager, ProcessPlatformCreator, MeetingManager, MeetingViewer, PortalManager, BBSManager,
-			CMSManager, OKRManager, CRMManager,TeamWorkManager, QueryManager, MessageManager, HotPictureManager, SearchPrivilege));
+			CMSManager, OKRManager, CRMManager,TeamWorkManager, QueryManager, MessageManager, HotPictureManager, SearchPrivilege, FileManager));
 
 	public static String name(String distinguishedName) {
 		if (StringUtils.contains(distinguishedName, "@")) {

+ 4 - 1
o2server/x_program_center/src/main/java/com/x/program/center/Context.java

@@ -236,7 +236,8 @@ public class Context extends AbstractContext {
 				OrganizationDefinition.TeamWorkManager, OrganizationDefinition.CMSManager,
 				OrganizationDefinition.OKRManager, OrganizationDefinition.CRMManager,
 				OrganizationDefinition.QueryManager, OrganizationDefinition.MessageManager,
-				OrganizationDefinition.SearchPrivilege, OrganizationDefinition.HotPictureManager);
+				OrganizationDefinition.SearchPrivilege, OrganizationDefinition.HotPictureManager,
+				OrganizationDefinition.FileManager);
 		roles = roles.stream().sorted(Comparator.comparing(String::toString)).collect(Collectors.toList());
 		for (String str : roles) {
 			EntityManager em = emc.get(Role.class);
@@ -310,6 +311,8 @@ public class Context extends AbstractContext {
 			return OrganizationDefinition.MessageManager_description;
 		} else if (OrganizationDefinition.SearchPrivilege.equalsIgnoreCase(str)) {
 			return OrganizationDefinition.SearchPrivilege_description;
+		} else if (OrganizationDefinition.FileManager.equalsIgnoreCase(str)) {
+			return OrganizationDefinition.FileManager_description;
 		}
 		return "";
 	}