Fix case manual process start for C8 (#284)

wkspower · May 31, 2024 · 2e13970 · 2e13970
2 parents 0d02dc9 + 608f48c
commit 2e13970
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...a/libraries/c8-client/src/main/java/com/wks/bpm/engine/camunda/client/C8EngineClient.java b/...a/libraries/c8-client/src/main/java/com/wks/bpm/engine/camunda/client/C8EngineClient.java
@@ -11,8 +11,10 @@
  */
 package com.wks.bpm.engine.camunda.client;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -115,7 +117,11 @@ public Task[] findTasks(final Optional<String> processInstanceBusinessKey, final
 		ProcessInstance[] processInstances = operateClient.searchProcessInstances(Optional.empty(),
 				processInstanceBusinessKey, Optional.empty(), bpmEngine);
 
-		return processInstances.length > 0 ? tasklistClient.find(processInstances[0].getId(), bpmEngine) : new Task[0];
+		List<Task> allTasks = Arrays.stream(processInstances)
+				.flatMap(processInstance -> Arrays.stream(tasklistClient.find(processInstance.getId(), bpmEngine)))
+				.collect(Collectors.toList());
+
+		return allTasks.toArray(new Task[0]);
 	}
 
 	@Override

diff --git a/.../libraries/c8-client/src/main/java/com/wks/bpm/engine/camunda/client/C8OperateClient.java b/.../libraries/c8-client/src/main/java/com/wks/bpm/engine/camunda/client/C8OperateClient.java
@@ -144,8 +144,10 @@ public ProcessDefinition[] findProcessDefinitions(BpmEngine bpmEngine) {
 
 					.map(o ->
 
-					ProcessDefinitionImpl.builder().bpmEngineId(bpmEngine.getId()).id(o.getBpmnProcessId())
-							.key(String.valueOf(o.getKey())).version(String.valueOf(o.getVersion())).name(o.getName())
+					// for C8, case definition BpmnProcessId  = WKS process definition key
+					// for C8, case definition key  = WKS process definition Id
+					ProcessDefinitionImpl.builder().bpmEngineId(bpmEngine.getId()).id(String.valueOf(o.getKey()))
+							.key(o.getBpmnProcessId()).version(String.valueOf(o.getVersion())).name(o.getName())
 							.build())
 
 					.toArray(ProcessDefinitionImpl[]::new);