Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
8386bc2c
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8386bc2c
编写于
10月 14, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加云文件角色
上级
fd6e8d50
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
2 deletion
+8
-2
o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java
...ase/core/project/organization/OrganizationDefinition.java
+4
-1
o2server/x_program_center/src/main/java/com/x/program/center/Context.java
...am_center/src/main/java/com/x/program/center/Context.java
+4
-1
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java
浏览文件 @
8386bc2c
...
@@ -74,6 +74,9 @@ public class OrganizationDefinition {
...
@@ -74,6 +74,9 @@ public class OrganizationDefinition {
public
final
static
String
SearchPrivilege
=
"SearchPrivilege"
;
public
final
static
String
SearchPrivilege
=
"SearchPrivilege"
;
public
final
static
String
SearchPrivilege_description
=
"搜索管理员(系统角色),可以跨权限对系统内容进行搜索。"
;
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
String
RoleDefinitionSuffix
=
"SystemRole"
;
public
final
static
Pattern
person_distinguishedName_pattern
=
Pattern
.
compile
(
"^(.+)\\@(\\S+)\\@P$"
);
public
final
static
Pattern
person_distinguishedName_pattern
=
Pattern
.
compile
(
"^(.+)\\@(\\S+)\\@P$"
);
...
@@ -97,7 +100,7 @@ public class OrganizationDefinition {
...
@@ -97,7 +100,7 @@ public class OrganizationDefinition {
public
final
static
List
<
String
>
DEFAULTROLES
=
new
UnmodifiableList
<
String
>(
ListTools
.
toList
(
Manager
,
public
final
static
List
<
String
>
DEFAULTROLES
=
new
UnmodifiableList
<
String
>(
ListTools
.
toList
(
Manager
,
AttendanceManager
,
OrganizationManager
,
PersonManager
,
GroupManager
,
UnitManager
,
RoleManager
,
AttendanceManager
,
OrganizationManager
,
PersonManager
,
GroupManager
,
UnitManager
,
RoleManager
,
ProcessPlatformManager
,
ProcessPlatformCreator
,
MeetingManager
,
MeetingViewer
,
PortalManager
,
BBSManager
,
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
)
{
public
static
String
name
(
String
distinguishedName
)
{
if
(
StringUtils
.
contains
(
distinguishedName
,
"@"
))
{
if
(
StringUtils
.
contains
(
distinguishedName
,
"@"
))
{
...
...
o2server/x_program_center/src/main/java/com/x/program/center/Context.java
浏览文件 @
8386bc2c
...
@@ -236,7 +236,8 @@ public class Context extends AbstractContext {
...
@@ -236,7 +236,8 @@ public class Context extends AbstractContext {
OrganizationDefinition
.
TeamWorkManager
,
OrganizationDefinition
.
CMSManager
,
OrganizationDefinition
.
TeamWorkManager
,
OrganizationDefinition
.
CMSManager
,
OrganizationDefinition
.
OKRManager
,
OrganizationDefinition
.
CRMManager
,
OrganizationDefinition
.
OKRManager
,
OrganizationDefinition
.
CRMManager
,
OrganizationDefinition
.
QueryManager
,
OrganizationDefinition
.
MessageManager
,
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
());
roles
=
roles
.
stream
().
sorted
(
Comparator
.
comparing
(
String:
:
toString
)).
collect
(
Collectors
.
toList
());
for
(
String
str
:
roles
)
{
for
(
String
str
:
roles
)
{
EntityManager
em
=
emc
.
get
(
Role
.
class
);
EntityManager
em
=
emc
.
get
(
Role
.
class
);
...
@@ -310,6 +311,8 @@ public class Context extends AbstractContext {
...
@@ -310,6 +311,8 @@ public class Context extends AbstractContext {
return
OrganizationDefinition
.
MessageManager_description
;
return
OrganizationDefinition
.
MessageManager_description
;
}
else
if
(
OrganizationDefinition
.
SearchPrivilege
.
equalsIgnoreCase
(
str
))
{
}
else
if
(
OrganizationDefinition
.
SearchPrivilege
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
SearchPrivilege_description
;
return
OrganizationDefinition
.
SearchPrivilege_description
;
}
else
if
(
OrganizationDefinition
.
FileManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
FileManager_description
;
}
}
return
""
;
return
""
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录