From cc4a2e33f70273275b7bbc6bfefe181995a2f26d Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 13 Jan 2021 10:25:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/service/app/impl/ResultRecordServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java index c9ea08ce..b3366477 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java @@ -1407,7 +1407,11 @@ public class ResultRecordServiceImpl extends ServiceImpl preFlowRecords = flowRecordService.selectFlowRecordByRecordIdFlowIndex(currentFlowRecord.getRecordId(), currentFlowRecord.getFlowIndex() - 1); if (CollectionUtils.isNotEmpty(preFlowRecords)) { for (FlowRecord flowRecord : preFlowRecords) { - if (flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId()) && recordDetailDto.getLoginUserId().equals(resultRecord.getStaffId())) { + if (flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId()) + && recordDetailDto.getLoginUserId().equals(resultRecord.getStaffId()) + //在目标制定的时候和结果录入的时候允许撤回 + && (flowRecord.getFlowProcess().equals(new Integer(0)) || flowRecord.getFlowProcess().equals(new Integer(3))) + ) { auth.put("recall", 1); } }