提交 a0eb84f6 编写于 作者: B baoliang

check definitions is null when delete project.

上级 2d0084ff
...@@ -159,6 +159,7 @@ public enum Status { ...@@ -159,6 +159,7 @@ public enum Status {
NAME_NULL(10134,"name must be not null"), NAME_NULL(10134,"name must be not null"),
NAME_EXIST(10135, "name {0} already exists"), NAME_EXIST(10135, "name {0} already exists"),
SAVE_ERROR(10136, "save error"), SAVE_ERROR(10136, "save error"),
DELETE_PROJECT_ERROR_DEFINES_NOT_NULL(10137, "please delete the process definitions in project first!"),
......
...@@ -20,9 +20,11 @@ import cn.escheduler.api.enums.Status; ...@@ -20,9 +20,11 @@ import cn.escheduler.api.enums.Status;
import cn.escheduler.api.utils.Constants; import cn.escheduler.api.utils.Constants;
import cn.escheduler.api.utils.PageInfo; import cn.escheduler.api.utils.PageInfo;
import cn.escheduler.common.enums.UserType; import cn.escheduler.common.enums.UserType;
import cn.escheduler.dao.mapper.ProcessDefinitionMapper;
import cn.escheduler.dao.mapper.ProjectMapper; import cn.escheduler.dao.mapper.ProjectMapper;
import cn.escheduler.dao.mapper.ProjectUserMapper; import cn.escheduler.dao.mapper.ProjectUserMapper;
import cn.escheduler.dao.mapper.UserMapper; import cn.escheduler.dao.mapper.UserMapper;
import cn.escheduler.dao.model.ProcessDefinition;
import cn.escheduler.dao.model.Project; import cn.escheduler.dao.model.Project;
import cn.escheduler.dao.model.ProjectUser; import cn.escheduler.dao.model.ProjectUser;
import cn.escheduler.dao.model.User; import cn.escheduler.dao.model.User;
...@@ -55,6 +57,9 @@ public class ProjectService extends BaseService{ ...@@ -55,6 +57,9 @@ public class ProjectService extends BaseService{
@Autowired @Autowired
private ProjectUserMapper projectUserMapper; private ProjectUserMapper projectUserMapper;
@Autowired
private ProcessDefinitionMapper processDefinitionMapper;
/** /**
* create project * create project
* *
...@@ -199,6 +204,12 @@ public class ProjectService extends BaseService{ ...@@ -199,6 +204,12 @@ public class ProjectService extends BaseService{
if (checkResult != null) { if (checkResult != null) {
return checkResult; return checkResult;
} }
List<ProcessDefinition> processDefinitionList = processDefinitionMapper.queryAllDefinitionList(projectId);
if(processDefinitionList.size() > 0){
putMsg(result, Status.DELETE_PROJECT_ERROR_DEFINES_NOT_NULL);
return result;
}
int delete = projectMapper.delete(projectId); int delete = projectMapper.delete(projectId);
if (delete > 0) { if (delete > 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册