From 94ea607f06c4c1766709d13a58599b8c7142733e Mon Sep 17 00:00:00 2001 From: baoliang Date: Mon, 8 Apr 2019 14:32:31 +0800 Subject: [PATCH] fix bug, update action would change the user of definition. --- .../api/controller/ProcessDefinitionController.java | 2 +- .../escheduler/api/service/ProcessDefinitionService.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java b/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java index 9cf27a32ed..ec1f38b0ce 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java @@ -127,7 +127,7 @@ public class ProcessDefinitionController extends BaseController{ logger.info("login user {}, update process define, project name: {}, process define name: {}, " + "process_definition_json: {}, desc: {}, locations:{}, connects:{}", loginUser.getUserName(), projectName, name, processDefinitionJson,desc, locations, connects); - Map result = processDefinitionService.updateProccessDefinition(loginUser, projectName, id, name, + Map result = processDefinitionService.updateProcessDefinition(loginUser, projectName, id, name, processDefinitionJson, desc, locations, connects); return returnDataList(result); }catch (Exception e){ diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java index 1b0d806967..119c840e56 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java @@ -247,9 +247,9 @@ public class ProcessDefinitionService extends BaseDAGService { * @param connects * @return */ - public Map updateProccessDefinition(User loginUser, String projectName, int id, String name, - String processDefinitionJson, String desc, - String locations, String connects) throws JsonProcessingException { + public Map updateProcessDefinition(User loginUser, String projectName, int id, String name, + String processDefinitionJson, String desc, + String locations, String connects) { Map result = new HashMap<>(5); Project project = projectMapper.queryByName(projectName); @@ -284,7 +284,6 @@ public class ProcessDefinitionService extends BaseDAGService { processDefine.setName(name); processDefine.setReleaseState(ReleaseState.OFFLINE); processDefine.setProjectId(project.getId()); - processDefine.setUserId(loginUser.getId()); processDefine.setProcessDefinitionJson(processDefinitionJson); processDefine.setDesc(desc); processDefine.setLocations(locations);