From 31ea785f0ebb83e1061ee3040da892d81b89119f Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Wed, 13 Jan 2021 10:57:09 +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

---
 .../service/app/impl/ResultRecordServiceImpl.java   | 13 ++++++++++++-
 1 file changed, 12 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 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<ResultRecordMapper, Res
 
 
     private R rejectN(ApprovalDto approvalDto) {
-        log.info("驳回到前n个节点");
+        log.info("驳回到前n个节点 ： " + JSON.toJSONString(approvalDto) );
+
         FlowRecord f = flowRecordService.selectFlowRecordById(approvalDto.getFlowRecordId());
         ResultRecord resultRecord = resultRecordService.selectResultRecordById(f.getRecordId());
         List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdGeFlowIndex(f.getRecordId(), f.getFlowIndex());
@@ -1132,6 +1133,16 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
 
 
     private R reSubmit(ApprovalDto approvalDto) {
+        List<FlowRecord> 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);
     }