diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index 7394857e..b84f68c1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -422,16 +422,18 @@ public class MyGlobalEventListener implements ActivitiEventListener { String parentTaskId = (String) execution.getVariable(ActivitiCommon.PARENT_TASK_ID); if (StringUtils.isNotBlank(parentTaskId)) { int i = processAllService.countByParentTaskId(parentTaskId); - if (StandardInterpretCommon.KEY_1.equals(processDefinitionId) || - StandardInterpretCommon.KEY_2.equals(processDefinitionId) || - StandardInterpretCommon.KEY_3.equals(processDefinitionId)) { + if (StandardInterpretCommon.KEY_1.equals(processDefinitionId.split(":")[0]) || + StandardInterpretCommon.KEY_2.equals(processDefinitionId.split(":")[0]) || + StandardInterpretCommon.KEY_3.equals(processDefinitionId.split(":")[0])) { if (i == 0) { + TaskService taskService = SpringContextUtil.getBean(TaskService.class); if (StandardInterpretCommon.KEY_1.equals(processDefinitionId)) { - TaskService taskService = SpringContextUtil.getBean(TaskService.class); boolean b = isChildrenNodeAllComplete(processInstanceId, parentTaskId); if (b) { taskService.complete(parentTaskId); } + }else { + taskService.complete(parentTaskId); } } }