|
|
@ -802,6 +802,8 @@ public class ProcessDefinitionService extends BaseDAGService { |
|
|
|
JSONObject subParams = JSONUtils.parseObject(taskNode.getString("params")); |
|
|
|
JSONObject subParams = JSONUtils.parseObject(taskNode.getString("params")); |
|
|
|
Integer subProcessId = subParams.getInteger("processDefinitionId"); |
|
|
|
Integer subProcessId = subParams.getInteger("processDefinitionId"); |
|
|
|
ProcessDefinition subProcess = processDefineMapper.queryByDefineId(subProcessId); |
|
|
|
ProcessDefinition subProcess = processDefineMapper.queryByDefineId(subProcessId); |
|
|
|
|
|
|
|
//check is sub process exist in db
|
|
|
|
|
|
|
|
if (null != subProcess) { |
|
|
|
String subProcessJson = subProcess.getProcessDefinitionJson(); |
|
|
|
String subProcessJson = subProcess.getProcessDefinitionJson(); |
|
|
|
//check current project has sub process
|
|
|
|
//check current project has sub process
|
|
|
|
ProcessDefinition currentProjectSubProcess = processDefineMapper.queryByDefineName(targetProject.getId(), subProcess.getName()); |
|
|
|
ProcessDefinition currentProjectSubProcess = processDefineMapper.queryByDefineName(targetProject.getId(), subProcess.getName()); |
|
|
@ -861,7 +863,7 @@ public class ProcessDefinitionService extends BaseDAGService { |
|
|
|
subParams.put("processDefinitionId", newSubProcessDefine.getId()); |
|
|
|
subParams.put("processDefinitionId", newSubProcessDefine.getId()); |
|
|
|
taskNode.put("params", subParams); |
|
|
|
taskNode.put("params", subParams); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|