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 b3366477..aa0e8f98 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 @@ -953,7 +953,8 @@ public class ResultRecordServiceImpl extends ServiceImpl flowRecords = flowRecordService.selectFlowRecordByRecordIdGeFlowIndex(f.getRecordId(), f.getFlowIndex()); @@ -1132,6 +1133,16 @@ public class ResultRecordServiceImpl extends ServiceImpl currflowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(approvalDto.getResultRecordId(), 2); + if (CollectionUtils.isNotEmpty(currflowRecords)) { + FlowRecord preFlowRecord = currflowRecords.get(0); + if (approvalDto.getLoginUserId() != null && approvalDto.getLoginUserId() > 0) { + if (!preFlowRecord.getApprovalStaffId().equals(approvalDto.getLoginUserId())) { + log.info("审批人不是自己 ,ApprovalStaffId :" + preFlowRecord.getApprovalStaffId() + ",登陆用户 id:" + approvalDto.getLoginUserId()); + return R.error("审批人不是自己,不能撤回"); + } + } + } return newReject(approvalDto); }