|
@@ -305,18 +305,18 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
305
|
305
|
runtimeService.createChangeActivityStateBuilder()
|
306
|
306
|
.processInstanceId(task.getProcessInstanceId())
|
307
|
307
|
.moveActivityIdsToSingleActivityId(currentIds, flowTaskVo.getTargetKey()).changeState();
|
308
|
|
-// String currentTaskId = taskService.createTaskQuery().singleResult().getId();
|
309
|
|
-// List<HistoricTaskInstance> htiList = historyService.createHistoricTaskInstanceQuery()
|
310
|
|
-// .processInstanceId(task.getProcessInstanceId()).taskDefinitionKey(flowTaskVo.getTargetKey())
|
311
|
|
-// .list();
|
312
|
|
-// String taskAssignee = "";
|
313
|
|
-// for (HistoricTaskInstance hti: htiList) {
|
314
|
|
-// if (!hti.getId().equals(currentTaskId)) {
|
315
|
|
-// taskAssignee = hti.getAssignee();
|
316
|
|
-// break;
|
317
|
|
-// }
|
318
|
|
-// }
|
319
|
|
-// taskService.setAssignee(currentTaskId, taskAssignee);
|
|
308
|
+ String currentTaskId = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId();
|
|
309
|
+ List<HistoricTaskInstance> htiList = historyService.createHistoricTaskInstanceQuery()
|
|
310
|
+ .processInstanceId(task.getProcessInstanceId()).taskDefinitionKey(flowTaskVo.getTargetKey())
|
|
311
|
+ .list();
|
|
312
|
+ String taskAssignee = "";
|
|
313
|
+ for (HistoricTaskInstance hti: htiList) {
|
|
314
|
+ if (!hti.getId().equals(currentTaskId)) {
|
|
315
|
+ taskAssignee = hti.getAssignee();
|
|
316
|
+ break;
|
|
317
|
+ }
|
|
318
|
+ }
|
|
319
|
+ taskService.setAssignee(currentTaskId, taskAssignee);
|
320
|
320
|
} catch (FlowableObjectNotFoundException e) {
|
321
|
321
|
throw new CustomException("未找到流程实例,流程可能已发生变化");
|
322
|
322
|
} catch (FlowableException e) {
|
|
@@ -716,6 +716,19 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
716
|
716
|
runtimeService.createChangeActivityStateBuilder()
|
717
|
717
|
.processInstanceId(task.getProcessInstanceId())
|
718
|
718
|
.moveActivityIdsToSingleActivityId(currentIds, lastHistoricTaskDefinitionKey).changeState();
|
|
719
|
+ String currentTaskId = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId();
|
|
720
|
+ List<HistoricTaskInstance> htiTargetList = historyService.createHistoricTaskInstanceQuery()
|
|
721
|
+ .processInstanceId(task.getProcessInstanceId())
|
|
722
|
+ .taskDefinitionKey(flowTaskVo.getTargetKey())
|
|
723
|
+ .list();
|
|
724
|
+ String taskAssignee = "";
|
|
725
|
+ for (HistoricTaskInstance hti: htiTargetList) {
|
|
726
|
+ if (!hti.getId().equals(currentTaskId)) {
|
|
727
|
+ taskAssignee = hti.getAssignee();
|
|
728
|
+ break;
|
|
729
|
+ }
|
|
730
|
+ }
|
|
731
|
+ taskService.setAssignee(currentTaskId, taskAssignee);
|
719
|
732
|
} catch (FlowableObjectNotFoundException e) {
|
720
|
733
|
throw new CustomException("未找到流程实例,流程可能已发生变化");
|
721
|
734
|
} catch (FlowableException e) {
|