diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java index eb848c77..798b8439 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java @@ -1012,7 +1012,6 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); qw.eq(ProcessNode::getProcessDefinitionId, processDefinitionId); @@ -1025,7 +1024,22 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); + qw.eq(ProcessNode::getProcessDefinitionId, processDefinitionId); + qw.eq(ProcessNode::getIsView, 1); + qw.eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_COLLECT_3); + ProcessNode processNode3 = processNodeService.getOne(qw, false); ProcessNodeLink link = new ProcessNodeLink(); link.setProcessDefinitionId(processDefinitionId); link.setProcessNodeId(processNode3.getId()); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 14082b21..10791d35 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -110,6 +110,19 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { .eq(ProcessNodeLink::getProcessInstanceId, processInstanceId) .eq(ProcessNodeLink::getProcessNodeId, processNode.getId())); } + + // 删除各部所主管级领导汇总节点处理人 + ProcessNode processNode2 = processNodeService.getOne( + new LambdaQueryWrapper() + .eq(ProcessNode::getProcessDefinitionId, processDefinitionId) + .eq(ProcessNode::getXmlNodeId, ConsultationTaskKey.DEPART_LEADER_COLLECT_3)); + if (!Objects.isNull(processNode2)){ + processNodeLinkService.remove( + new LambdaQueryWrapper() + .eq(ProcessNodeLink::getProcessDefinitionId, processDefinitionId) + .eq(ProcessNodeLink::getProcessInstanceId, processInstanceId) + .eq(ProcessNodeLink::getProcessNodeId, processNode2.getId())); + } } // 根据流程实例id和任务处理人查询任务