diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProjectService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProjectService.java index f33a3659126b358f244e1261dba5b722f4497a1d..8f9a62000a5be10cb0f6c2dfa29dfcf0034b49b1 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProjectService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProjectService.java @@ -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 havve permission to see the project + * @return true if the login user have permission to see the project */ public Map checkProjectAndAuth(User loginUser, Project project, String projectName) { @@ -143,7 +143,7 @@ public class ProjectService extends BaseService{ public boolean hasProjectAndPerm(User loginUser, Project project, Map 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 processDefinitionList = processDefinitionMapper.queryAllDefinitionList(projectId); if (!hasPerm(loginUser, project.getUserId())) { putMsg(result, Status.USER_NO_OPERATION_PERM); return result; } + List 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 getCheckResult(User loginUser, Project project) { - Map checkResult = checkProjectAndAuth(loginUser, project, project.getName()); + String projectName = project == null ? null:project.getName(); + Map 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 update(User loginUser, Integer projectId, String projectName, String desc) { Map result = new HashMap<>(5); + Map 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) {