|
|
@@ -244,8 +244,10 @@ public class ActivitiService {
|
|
|
public List<ActiUserTaskDTO> findAllProcessTasks(AllProcessTaskVM allVm) {
|
|
|
List<String> userList = Arrays.asList( allVm.getUserIds().split(",") );
|
|
|
List<String> definitionKeys = Arrays.asList( allVm.getDefinitionKeys().split(",") );
|
|
|
- List<Task> resultTasks = taskService.createTaskQuery().processDefinitionKeyIn(definitionKeys).taskAssigneeIds(userList).list();
|
|
|
- String businessKeys = "";
|
|
|
+ List<Task> resultTasks = taskService.createTaskQuery()
|
|
|
+ .processDefinitionKeyIn(definitionKeys)
|
|
|
+ .list();
|
|
|
+
|
|
|
List<ActiUserTaskDTO> myTaskDTOS = new ArrayList<>();
|
|
|
for (Task myTask : resultTasks) {
|
|
|
ActiUserTaskDTO myTaskDTO = new ActiUserTaskDTO();
|
|
|
@@ -254,7 +256,7 @@ public class ActivitiService {
|
|
|
myTaskDTO.setWorkflowId(myTask.getProcessInstanceId());
|
|
|
myTaskDTO.setCreateTime(myTask.getCreateTime().getTime());
|
|
|
myTaskDTO.setTaskName(myTask.getName());
|
|
|
- myTaskDTO.setUserId(myTask.getAssignee());
|
|
|
+ myTaskDTO.setUserId( taskService.getVariable(myTask.getId(), "users").toString() );
|
|
|
myTaskDTOS.add(myTaskDTO);
|
|
|
}
|
|
|
return myTaskDTOS;
|