From 8386bc2c1b31ede875c45e9dda44bb1a3db0390f Mon Sep 17 00:00:00 2001
From: o2sword <171715986@qq.com>
Date: Wed, 14 Oct 2020 09:18:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=91=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/project/organization/OrganizationDefinition.java    | 5 ++++-
 .../src/main/java/com/x/program/center/Context.java          | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java
index 08f2e0a17b..70dcf94516 100644
--- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java
+++ b/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, "@")) {
diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/Context.java b/o2server/x_program_center/src/main/java/com/x/program/center/Context.java
index 031c22f781..f91f05f911 100644
--- a/o2server/x_program_center/src/main/java/com/x/program/center/Context.java
+++ b/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 "";
 	}
-- 
GitLab