From d9e31d2b060eb944dd1e233ecace3396bd138f81 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Fri, 8 Jan 2021 10:24:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A2=E6=99=92=E9=95=9C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/app/impl/ResultRecordServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 97dc8f6f..a785bfb5 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 @@ -1352,16 +1352,18 @@ public class ResultRecordServiceImpl extends ServiceImpl preFlowRecords = flowRecordService.selectFlowRecordByRecordIdFlowIndex(currentResultRecord.getRecordId(), currentResultRecord.getFlowIndex() - 1); - if(CollectionUtils.isNotEmpty(preFlowRecords)){ - for(FlowRecord flowRecord:preFlowRecords){ - if(flowRecord.getApprovalStaffId().equals(resultRecord.getStaffId())){ - auth.put("recall",1); - } + } + + List preFlowRecords = flowRecordService.selectFlowRecordByRecordIdFlowIndex(currentFlowRecord.getRecordId(), currentFlowRecord.getFlowIndex() - 1); + if (CollectionUtils.isNotEmpty(preFlowRecords)) { + for (FlowRecord flowRecord : preFlowRecords) { + if (flowRecord.getApprovalStaffId().equals(resultRecord.getStaffId())) { + auth.put("recall", 1); } } } + } //如果是绩效管理员有一键催办功能 StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(recordDetailDto.getLoginUserId(),