Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
7b3e1a46
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,发现更多精彩内容 >>
提交
7b3e1a46
编写于
3月 18, 2019
作者:
R
roo00
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bug fix
上级
bb35f294
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
19 addition
and
15 deletion
+19
-15
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionEntityNotExist.java
.../base/core/project/exception/ExceptionEntityNotExist.java
+4
-0
o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/EffectivePerson.java
...in/java/com/x/base/core/project/http/EffectivePerson.java
+8
-8
o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/PropertyTools.java
...ain/java/com/x/base/core/project/tools/PropertyTools.java
+5
-5
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/element/QueryViewFactory.java
...ms/assemble/control/factory/element/QueryViewFactory.java
+2
-2
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/exception/ExceptionEntityNotExist.java
浏览文件 @
7b3e1a46
...
...
@@ -18,4 +18,8 @@ public class ExceptionEntityNotExist extends PromptException {
super
(
"标识为:{} 的 {} 对象不存在."
,
flag
,
name
);
}
public
<
T
extends
JpaObject
>
ExceptionEntityNotExist
(
String
flag
)
{
super
(
"标识为:{} 的对象不存在."
,
flag
);
}
}
o2server/x_base_core_project/src/main/java/com/x/base/core/project/http/EffectivePerson.java
浏览文件 @
7b3e1a46
...
...
@@ -129,8 +129,8 @@ public class EffectivePerson extends GsonPropertyObject {
return
!
this
.
isManager
();
}
public
boolean
is
User
(
Collection
<
String
>
names
)
{
if
(
Objects
.
equals
(
TokenType
.
user
,
this
.
getTokenType
()))
{
public
boolean
is
Person
(
Collection
<
String
>
names
)
{
if
(
Objects
.
equals
(
TokenType
.
user
,
this
.
getTokenType
())
||
Objects
.
equals
(
TokenType
.
manager
,
this
.
getTokenType
())
)
{
if
(
null
!=
names
)
{
List
<
String
>
list
=
new
ArrayList
<>(
names
);
if
(
list
.
contains
(
this
.
distinguishedName
))
{
...
...
@@ -154,16 +154,16 @@ public class EffectivePerson extends GsonPropertyObject {
return
false
;
}
public
boolean
is
User
(
String
...
names
)
{
return
this
.
is
User
(
Arrays
.
asList
(
names
));
public
boolean
is
Person
(
String
...
names
)
{
return
this
.
is
Person
(
Arrays
.
asList
(
names
));
}
public
boolean
isNot
User
(
String
...
names
)
{
return
!
this
.
is
User
(
names
);
public
boolean
isNot
Person
(
String
...
names
)
{
return
!
this
.
is
Person
(
names
);
}
public
boolean
isNot
User
(
Collection
<
String
>
names
)
{
return
!
this
.
is
User
(
names
);
public
boolean
isNot
Person
(
Collection
<
String
>
names
)
{
return
!
this
.
is
Person
(
names
);
}
public
String
getToken
()
{
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/tools/PropertyTools.java
浏览文件 @
7b3e1a46
...
...
@@ -5,11 +5,11 @@ import org.apache.commons.beanutils.PropertyUtils;
public
class
PropertyTools
{
@SuppressWarnings
(
"unchecked"
)
public
static
<
T
>
T
getOrElse
(
Object
bean
,
String
name
,
Class
<
T
>
cls
,
T
defaultObject
)
throws
Exception
{
if
(
null
==
bean
)
{
return
defaultObject
;
}
if
(
PropertyUtils
.
isReadable
(
bean
,
name
))
{
return
(
T
)
PropertyUtils
.
getProperty
(
bean
,
name
);
if
(
(
null
!=
bean
)
&&
PropertyUtils
.
isReadable
(
bean
,
name
)
)
{
Object
o
=
PropertyUtils
.
getProperty
(
bean
,
name
)
;
if
(
null
!=
o
)
{
return
(
T
)
o
;
}
}
return
defaultObject
;
}
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/element/QueryViewFactory.java
浏览文件 @
7b3e1a46
...
...
@@ -35,13 +35,13 @@ public class QueryViewFactory extends ElementFactory {
&&
ListTools
.
isEmpty
(
queryView
.
getAvailablePersonList
()))
{
return
true
;
}
if
(
effectivePerson
.
is
User
(
queryView
.
getCreatorPerson
()))
{
if
(
effectivePerson
.
is
Person
(
queryView
.
getCreatorPerson
()))
{
return
true
;
}
if
(
effectivePerson
.
isManager
())
{
return
true
;
}
if
(
effectivePerson
.
is
User
(
queryView
.
getControllerList
()))
{
if
(
effectivePerson
.
is
Person
(
queryView
.
getControllerList
()))
{
return
true
;
}
if
(
ListTools
.
isNotEmpty
(
queryView
.
getAvailablePersonList
()))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录