提交 f7772a53 编写于 作者: tangyaolong's avatar tangyaolong

解决冲突代码

上级 5a10bf6a
...@@ -643,23 +643,20 @@ public class WFCoreService ...@@ -643,23 +643,20 @@ public class WFCoreService
way.set("type",ProcFunction.BEFORESIGN.value); way.set("type",ProcFunction.BEFORESIGN.value);
way.setSequenceflowname(ProcFunction.BEFORESIGN.text); way.setSequenceflowname(ProcFunction.BEFORESIGN.text);
} }
List<ExtensionElement> elements = userTask.getExtensionElements().get("form"); else if(funcType.equals(ProcFunction.TURN.value)){
if(ObjectUtils.isEmpty(elements)){ way.set("type",ProcFunction.TURN.value);
return null; way.setSequenceflowname(ProcFunction.TURN.text);
}
LinkedHashMap processMap = new LinkedHashMap();
for (ExtensionElement element : elements) {
List<ExtensionAttribute> extensionAttributes = element.getAttributes().get("process-form");
if(!ObjectUtils.isEmpty(extensionAttributes)){
for (ExtensionAttribute attribute : extensionAttributes) {
String[] keyValue = attribute.getValue().split(":");
if(keyValue.length > 1){
processMap.put(keyValue[0],keyValue[1]);
}
} }
else if(funcType.equals(ProcFunction.FINISH.value)){
way.set("type",ProcFunction.FINISH.value);
way.setSequenceflowname(ProcFunction.FINISH.text);
} }
else{
return null;
} }
return processMap; way.setTaskid(task.getId());
way.setTaskdefinitionkey(task.getTaskDefinitionKey());
return way;
} }
/** /**
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册