This is an automated email from the ASF dual-hosted git repository. zhongjiajie pushed a commit to branch 3.0.5-prepare in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 48a8a230d82140219a6681f2da7297443b23cde6 Author: jackfanwan <[email protected]> AuthorDate: Wed Jan 18 20:08:28 2023 +0800 fix when the task details are not modified, the predecessor node cannot be modified (#13422) * fix when the task details are not modified, the predecessor node cannot be modified * deleted useless code Co-authored-by: fanwanlong <[email protected]> (cherry picked from commit 3b54de0c90083aaf0857362e7c237fb85ba3976c) --- .../api/service/impl/TaskDefinitionServiceImpl.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java index f35dc2451a..b74f5c3d1b 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java @@ -472,9 +472,6 @@ public class TaskDefinitionServiceImpl extends BaseServiceImpl implements TaskDe public Map<String, Object> updateTaskWithUpstream(User loginUser, long projectCode, long taskCode, String taskDefinitionJsonObj, String upstreamCodes) { Map<String, Object> result = new HashMap<>(); TaskDefinitionLog taskDefinitionToUpdate = updateTask(loginUser, projectCode, taskCode, taskDefinitionJsonObj, result); - if (result.get(Constants.STATUS) != Status.SUCCESS && taskDefinitionToUpdate == null) { - return result; - } List<ProcessTaskRelation> upstreamTaskRelations = processTaskRelationMapper.queryUpstreamByCode(projectCode, taskCode); Set<Long> upstreamCodeSet = upstreamTaskRelations.stream().map(ProcessTaskRelation::getPreTaskCode).collect(Collectors.toSet()); Set<Long> upstreamTaskCodes = Collections.emptySet(); @@ -484,10 +481,6 @@ public class TaskDefinitionServiceImpl extends BaseServiceImpl implements TaskDe if (CollectionUtils.isEqualCollection(upstreamCodeSet, upstreamTaskCodes) && taskDefinitionToUpdate == null) { putMsg(result, Status.SUCCESS); return result; - } else { - if (taskDefinitionToUpdate == null) { - taskDefinitionToUpdate = JSONUtils.parseObject(taskDefinitionJsonObj, TaskDefinitionLog.class); - } } Map<Long, TaskDefinition> queryUpStreamTaskCodeMap; if (!upstreamTaskCodes.isEmpty()) {
