Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
7ecfcb3c
o2oa
项目概览
weixin_42566577
/
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,发现更多精彩内容 >>
提交
7ecfcb3c
编写于
1月 21, 2022
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复三员管理安全管理员不能查看所有用户的问题
上级
bc7932b9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
3 addition
and
3 deletion
+3
-3
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java
...in/java/com/x/organization/assemble/control/Business.java
+1
-1
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListNext.java
...ization/assemble/control/jaxrs/person/ActionListNext.java
+1
-1
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPrev.java
...ization/assemble/control/jaxrs/person/ActionListPrev.java
+1
-1
未找到文件。
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java
浏览文件 @
7ecfcb3c
...
...
@@ -536,7 +536,7 @@ public class Business {
public
Predicate
personPredicateWithTopUnit
(
EffectivePerson
effectivePerson
)
throws
Exception
{
EntityManager
em
=
emc
.
get
(
Person
.
class
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
if
(
effectivePerson
.
isManager
()
||
this
.
hasAnyRole
(
effectivePerson
,
OrganizationDefinition
.
Manager
,
if
(
effectivePerson
.
is
Security
Manager
()
||
this
.
hasAnyRole
(
effectivePerson
,
OrganizationDefinition
.
Manager
,
OrganizationDefinition
.
OrganizationManager
))
{
return
cb
.
conjunction
();
}
else
{
...
...
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListNext.java
浏览文件 @
7ecfcb3c
...
...
@@ -45,7 +45,7 @@ class ActionListNext extends BaseAction {
id
=
o
.
getId
();
}
if
(
effectivePerson
.
isManager
()
||
business
.
hasAnyRole
(
effectivePerson
,
OrganizationDefinition
.
Manager
,
if
(
effectivePerson
.
is
Security
Manager
()
||
business
.
hasAnyRole
(
effectivePerson
,
OrganizationDefinition
.
Manager
,
OrganizationDefinition
.
OrganizationManager
))
{
result
=
this
.
standardListNext
(
Wo
.
copier
,
id
,
count
,
JpaObject
.
sequence_FIELDNAME
,
DESC
,
business
.
personPredicateWithTopUnit
(
effectivePerson
));
...
...
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPrev.java
浏览文件 @
7ecfcb3c
...
...
@@ -44,7 +44,7 @@ class ActionListPrev extends BaseAction {
}
id
=
o
.
getId
();
}
if
(
effectivePerson
.
isManager
()
||
business
.
hasAnyRole
(
effectivePerson
,
OrganizationDefinition
.
Manager
,
if
(
effectivePerson
.
is
Security
Manager
()
||
business
.
hasAnyRole
(
effectivePerson
,
OrganizationDefinition
.
Manager
,
OrganizationDefinition
.
OrganizationManager
))
{
result
=
this
.
standardListPrev
(
Wo
.
copier
,
id
,
count
,
JpaObject
.
sequence_FIELDNAME
,
DESC
,
business
.
personPredicateWithTopUnit
(
effectivePerson
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录