From 0cf176b6ebe5c595fb202d8c6f8daceb91ed83a4 Mon Sep 17 00:00:00 2001 From: wulin Date: Fri, 20 Nov 2020 14:13:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=B8=AD=E7=9A=84=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E4=B8=8D=E5=8F=91=E9=80=81=E5=BE=85=E5=8A=9E=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/business/DingtalkBusiness.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) 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){//任务结束了