Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
8651d529
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
8651d529
编写于
6月 12, 2020
作者:
L
luojing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加默认角色teamworkmanager
上级
2a0061fa
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
4 deletion
+27
-4
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
-2
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/ActionPriorityList.java
...ork/assemble/control/jaxrs/global/ActionPriorityList.java
+1
-1
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/GlobalAction.java
.../teamwork/assemble/control/jaxrs/global/GlobalAction.java
+18
-0
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/organization/OrganizationDefinition.java
浏览文件 @
8651d529
...
...
@@ -58,6 +58,9 @@ public class OrganizationDefinition {
public
final
static
String
CRMManager
=
"CRMManager"
;
public
final
static
String
CRMManager_discription
=
"CRM管理员(系统角色),可以进行CRM系统相关配置,对客户信息,商机等信息进行管理操作。"
;
public
final
static
String
TeamWorkManager
=
"TeamWorkManager"
;
public
final
static
String
TeamWorkManager_discription
=
"TeamWork管理员(系统角色),可以进行TeamWork系统相关配置,对项目,任务等信息进行管理操作。"
;
public
final
static
String
QueryManager
=
"QueryManager"
;
public
final
static
String
QueryManager_discription
=
"数据中心管理员(系统角色),可以在数据中心进行视图管理,统计管理等操作。"
;
...
...
@@ -94,7 +97,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
,
QueryManager
,
MessageManager
,
HotPictureManager
,
SearchPrivilege
));
CMSManager
,
OKRManager
,
CRMManager
,
TeamWorkManager
,
QueryManager
,
MessageManager
,
HotPictureManager
,
SearchPrivilege
));
public
static
String
name
(
String
distinguishedName
)
{
if
(
StringUtils
.
contains
(
distinguishedName
,
"@"
))
{
...
...
o2server/x_program_center/src/main/java/com/x/program/center/Context.java
浏览文件 @
8651d529
...
...
@@ -234,7 +234,7 @@ public class Context extends AbstractContext {
OrganizationDefinition
.
GroupManager
,
OrganizationDefinition
.
UnitManager
,
OrganizationDefinition
.
RoleManager
,
OrganizationDefinition
.
ProcessPlatformManager
,
OrganizationDefinition
.
ProcessPlatformCreator
,
OrganizationDefinition
.
MeetingManager
,
OrganizationDefinition
.
PortalManager
,
OrganizationDefinition
.
BBSManager
,
OrganizationDefinition
.
PortalManager
,
OrganizationDefinition
.
BBSManager
,
OrganizationDefinition
.
TeamWorkManager
,
OrganizationDefinition
.
CMSManager
,
OrganizationDefinition
.
OKRManager
,
OrganizationDefinition
.
CRMManager
,
OrganizationDefinition
.
QueryManager
,
OrganizationDefinition
.
MessageManager
,
OrganizationDefinition
.
SearchPrivilege
,
OrganizationDefinition
.
HotPictureManager
);
...
...
@@ -303,7 +303,9 @@ public class Context extends AbstractContext {
return
OrganizationDefinition
.
OKRManager_discription
;
}
else
if
(
OrganizationDefinition
.
CRMManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
CRMManager_discription
;
}
else
if
(
OrganizationDefinition
.
QueryManager
.
equalsIgnoreCase
(
str
))
{
}
else
if
(
OrganizationDefinition
.
TeamWorkManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
TeamWorkManager_discription
;
}
else
if
(
OrganizationDefinition
.
QueryManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
QueryManager_discription
;
}
else
if
(
OrganizationDefinition
.
MessageManager
.
equalsIgnoreCase
(
str
))
{
return
OrganizationDefinition
.
MessageManager_discription
;
...
...
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/ActionPriorityList.java
浏览文件 @
8651d529
...
...
@@ -40,7 +40,7 @@ public class ActionPriorityList extends BaseAction {
}
result
.
setData
(
wos
);
}
catch
(
Exception
e
)
{
Exception
exception
=
new
PriorityQueryException
(
e
,
"
根据用户拥有的
优先级信息列表时发生异常。"
);
Exception
exception
=
new
PriorityQueryException
(
e
,
"
查询
优先级信息列表时发生异常。"
);
result
.
error
(
exception
);
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
}
...
...
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/GlobalAction.java
浏览文件 @
8651d529
...
...
@@ -224,4 +224,22 @@ public class GlobalAction extends StandardJaxrsAction {
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
@JaxrsMethodDescribe
(
value
=
"初始化优先级信息."
,
action
=
ActionInitConfig
.
class
)
@GET
@Path
(
"initConfig"
)
@Produces
(
HttpMediaType
.
APPLICATION_JSON_UTF_8
)
@Consumes
(
MediaType
.
APPLICATION_JSON
)
public
void
initConfig
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
)
{
ActionResult
<
ActionInitConfig
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionInitConfig
().
execute
(
request
,
effectivePerson
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
}
asyncResponse
.
resume
(
ResponseFactory
.
getEntityTagActionResultResponse
(
request
,
result
));
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录