Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DolphinScheduler社区
DolphinScheduler
提交
49181fd0
DolphinScheduler
项目概览
DolphinScheduler社区
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
67
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
49181fd0
编写于
12月 28, 2019
作者:
T
Tboy
提交者:
GitHub
12月 28, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1607 from samz406/1227-token
project checkResult may NPE
上级
34b65373
f3f3ada9
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
5 deletion
+12
-5
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProjectService.java
...g/apache/dolphinscheduler/api/service/ProjectService.java
+12
-5
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProjectService.java
浏览文件 @
49181fd0
...
...
@@ -41,7 +41,7 @@ import static org.apache.dolphinscheduler.api.utils.CheckUtils.checkDesc;
/**
* project service
*HttpTask./
**/
**/
@Service
public
class
ProjectService
extends
BaseService
{
...
...
@@ -121,7 +121,7 @@ public class ProjectService extends BaseService{
* @param loginUser login user
* @param project project
* @param projectName project name
* @return true if the login user hav
v
e permission to see the project
* @return true if the login user have permission to see the project
*/
public
Map
<
String
,
Object
>
checkProjectAndAuth
(
User
loginUser
,
Project
project
,
String
projectName
)
{
...
...
@@ -143,7 +143,7 @@ public class ProjectService extends BaseService{
public
boolean
hasProjectAndPerm
(
User
loginUser
,
Project
project
,
Map
<
String
,
Object
>
result
)
{
boolean
checkResult
=
false
;
if
(
project
==
null
)
{
putMsg
(
result
,
Status
.
PROJECT_NOT_FOUNT
,
project
.
getName
()
);
putMsg
(
result
,
Status
.
PROJECT_NOT_FOUNT
,
""
);
}
else
if
(!
checkReadPermission
(
loginUser
,
project
))
{
putMsg
(
result
,
Status
.
USER_NO_OPERATION_PROJECT_PERM
,
loginUser
.
getUserName
(),
project
.
getName
());
}
else
{
...
...
@@ -199,13 +199,14 @@ public class ProjectService extends BaseService{
if
(
checkResult
!=
null
)
{
return
checkResult
;
}
List
<
ProcessDefinition
>
processDefinitionList
=
processDefinitionMapper
.
queryAllDefinitionList
(
projectId
);
if
(!
hasPerm
(
loginUser
,
project
.
getUserId
()))
{
putMsg
(
result
,
Status
.
USER_NO_OPERATION_PERM
);
return
result
;
}
List
<
ProcessDefinition
>
processDefinitionList
=
processDefinitionMapper
.
queryAllDefinitionList
(
projectId
);
if
(
processDefinitionList
.
size
()
>
0
){
putMsg
(
result
,
Status
.
DELETE_PROJECT_ERROR_DEFINES_NOT_NULL
);
return
result
;
...
...
@@ -227,7 +228,8 @@ public class ProjectService extends BaseService{
* @return check result
*/
private
Map
<
String
,
Object
>
getCheckResult
(
User
loginUser
,
Project
project
)
{
Map
<
String
,
Object
>
checkResult
=
checkProjectAndAuth
(
loginUser
,
project
,
project
.
getName
());
String
projectName
=
project
==
null
?
null
:
project
.
getName
();
Map
<
String
,
Object
>
checkResult
=
checkProjectAndAuth
(
loginUser
,
project
,
projectName
);
Status
status
=
(
Status
)
checkResult
.
get
(
Constants
.
STATUS
);
if
(
status
!=
Status
.
SUCCESS
)
{
return
checkResult
;
...
...
@@ -247,6 +249,11 @@ public class ProjectService extends BaseService{
public
Map
<
String
,
Object
>
update
(
User
loginUser
,
Integer
projectId
,
String
projectName
,
String
desc
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
5
);
Map
<
String
,
Object
>
descCheck
=
checkDesc
(
desc
);
if
(
descCheck
.
get
(
Constants
.
STATUS
)
!=
Status
.
SUCCESS
)
{
return
descCheck
;
}
Project
project
=
projectMapper
.
selectById
(
projectId
);
boolean
hasProjectAndPerm
=
hasProjectAndPerm
(
loginUser
,
project
,
result
);
if
(!
hasProjectAndPerm
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录