Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
451de8ea
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,发现更多精彩内容 >>
提交
451de8ea
编写于
9月 26, 2020
作者:
liyi_hz2008
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[内容管理]修复在没有设置主身份时,内容管理和考勤管理中根据用户名查询主身份报错的问题
[内容管理]修复在没有设置主身份时,内容管理和考勤管理中根据用户名查询主身份报错的问题
上级
68e4dd7c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
14 deletion
+18
-14
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java
...tendance/assemble/control/service/UserManagerService.java
+7
-5
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java
...ontrol/jaxrs/document/ActionPersistPublishByWorkFlow.java
+1
-1
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
...e/control/jaxrs/document/ActionPersistPublishContent.java
+1
-1
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/UserManagerService.java
...om/x/cms/assemble/control/service/UserManagerService.java
+9
-7
未找到文件。
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java
浏览文件 @
451de8ea
...
...
@@ -385,13 +385,15 @@ public class UserManagerService {
if
(
ListTools
.
isNotEmpty
(
identities
))
{
if
(
identities
.
size
()
==
1
)
{
return
identities
.
get
(
0
);
}
for
(
String
identity
:
identities
)
{
Identity
obj
=
business
.
organization
().
identity
().
getObject
(
identity
);
if
(
obj
!=
null
&&
obj
.
getMajor
()
!=
null
&&
obj
.
getMajor
()
)
{
return
identity
;
}
else
{
for
(
String
identity
:
identities
)
{
Identity
obj
=
business
.
organization
().
identity
().
getObject
(
identity
);
if
(
obj
.
getMajor
())
{
return
identity
;
}
}
}
return
identities
.
get
(
0
);
}
return
null
;
}
catch
(
Exception
e
)
{
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishByWorkFlow.java
浏览文件 @
451de8ea
...
...
@@ -182,7 +182,7 @@ public class ActionPersistPublishByWorkFlow extends BaseAction {
wi
.
setCreatorTopUnitName
(
"xadmin"
);
}
else
{
//尝试一下根据当前用户获取用户的第一个身份
wi
.
setCreatorIdentity
(
userManagerService
.
getMajorIdentityWithPerson
(
effectivePerson
.
getDistinguishedName
())
);
wi
.
setCreatorIdentity
(
userManagerService
.
getMajorIdentityWithPerson
(
effectivePerson
.
getDistinguishedName
())
);
}
}
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
浏览文件 @
451de8ea
...
...
@@ -199,7 +199,7 @@ public class ActionPersistPublishContent extends BaseAction {
wi
.
setCreatorTopUnitName
(
"xadmin"
);
}
else
{
//尝试一下根据传入的用户或者当前用户获取用户的第一个身份
wi
.
setCreatorIdentity
(
userManagerService
.
getMajorIdentityWithPerson
(
wi
.
getCreatorPerson
()
)
);
wi
.
setCreatorIdentity
(
userManagerService
.
getMajorIdentityWithPerson
(
wi
.
getCreatorPerson
()
)
);
}
}
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/UserManagerService.java
浏览文件 @
451de8ea
...
...
@@ -166,7 +166,7 @@ public class UserManagerService {
* @return
* @throws Exception
*/
public
String
getMajorIdentityWithPerson
(
String
personName
)
throws
Exception
{
public
String
getMajorIdentityWithPerson
(
String
personName
)
throws
Exception
{
List
<
String
>
identities
=
null
;
Business
business
=
null
;
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
...
...
@@ -179,16 +179,18 @@ public class UserManagerService {
}
}
identities
=
business
.
organization
().
identity
().
listWithPerson
(
personName
);
if
(
identities
!=
null
&&
!
identities
.
isEmpty
(
))
{
if
(
ListTools
.
isNotEmpty
(
identities
))
{
if
(
identities
.
size
()
==
1
)
{
return
identities
.
get
(
0
);
}
for
(
String
identity
:
identities
)
{
Identity
obj
=
business
.
organization
().
identity
().
getObject
(
identity
);
if
(
obj
.
getMajor
())
{
return
identity
;
}
else
{
for
(
String
identity
:
identities
)
{
Identity
obj
=
business
.
organization
().
identity
().
getObject
(
identity
);
if
(
obj
.
getMajor
())
{
return
identity
;
}
}
}
return
identities
.
get
(
0
);
}
return
null
;
}
catch
(
Exception
e
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录