diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index c1773552..75fb5b63 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -528,21 +528,23 @@ public class DingtalkBusiness { }else{ List flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(info.getResultRecord().getId(), 2); if(flowRecords.size() > 0){//给下一步骤需要处理的人发送待办任务 - List ids = flowRecords.stream().map(new Function() { - @Override - public Long apply(FlowRecord flowRecord) { - return flowRecord.getApprovalStaffId(); + if(flowRecords.get(0).getFlowProcess().intValue() != 2){//执行中的不发送待办 + logger.info("非执行中的节点发送待办任务{}", flowRecords.get(0).getFlowName()); + List ids = flowRecords.stream().map(new Function() { + @Override + public Long apply(FlowRecord flowRecord) { + return flowRecord.getApprovalStaffId(); + } + }).collect(Collectors.toList()); + List staffSimpleInfos = staffService.selectStaffSimpleInfos(ids); + for (StaffSimpleInfo staffSimpleInfo:staffSimpleInfos + ) { + sendNotic(staffSimpleInfo.getId(), staffSimpleInfo.getEmployeeId(), + flowRecords.get(0).getFlowName(), info.getFlowStart().getName(), + info.getResultRecord().getStaffName(), token, url, info.getResultRecord().getId()); + } - }).collect(Collectors.toList()); - List staffSimpleInfos = staffService.selectStaffSimpleInfos(ids); - for (StaffSimpleInfo staffSimpleInfo:staffSimpleInfos - ) { - sendNotic(staffSimpleInfo.getId(), staffSimpleInfo.getEmployeeId(), - flowRecords.get(0).getFlowName(), info.getFlowStart().getName(), - info.getResultRecord().getStaffName(), token, url, info.getResultRecord().getId()); - } - } //取消上一步骤发送的待办任务 if(flowRecords.size() == 0){//任务结束了