解决冲突代码

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/extensions/service/WFCoreService.java

@@ -643,23 +643,20 @@ public class WFCoreService
 			way.set("type",ProcFunction.BEFORESIGN.value);
 			way.setSequenceflowname(ProcFunction.BEFORESIGN.text);
 		}
-		List<ExtensionElement> elements = userTask.getExtensionElements().get("form");
-		if(ObjectUtils.isEmpty(elements)){
-			return null;
+		else if(funcType.equals(ProcFunction.TURN.value)){
+			way.set("type",ProcFunction.TURN.value);
+			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;
 	}
 
 	/**