From 88368e4d0322f3a960b848e336e8b7eb3f194c2a Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Wed, 26 Aug 2020 14:25:27 +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

---
 .../modules/app/controller/ResultRecordController.java | 10 ++++++++++
 .../sys/service/app/impl/ResultRecordServiceImpl.java  |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index ae682e66..18ad8ed2 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -1,5 +1,6 @@
 package com.lz.modules.app.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.lz.common.emun.WorkMsgTypeEnum;
 import com.lz.common.utils.*;
 import com.lz.modules.app.dto.DepartmentsDto;
@@ -16,6 +17,7 @@ import com.lz.modules.flow.entity.RecordAuth;
 import com.lz.modules.flow.entity.RecordFile;
 import com.lz.modules.flow.entity.StaffRole;
 import com.lz.modules.flow.model.Auth;
+import com.lz.modules.flow.model.StaffRoleDto;
 import com.lz.modules.flow.req.ResultDetailReq;
 import com.lz.modules.flow.service.FlowRecordService;
 import com.lz.modules.flow.service.RecordAuthService;
@@ -308,6 +310,14 @@ public class ResultRecordController extends AbstractController {
                     if (flowRecord.getId().equals(req.getRollbackFlowId())) {
                         resultRecord.setFlowStaffIdRole(flowRecord.getFlowStaffIdRole());
                         resultRecord.setStatus(req.getStatus());
+                        flowRecord.getFlowStaffIdRole();
+                        List<StaffRoleDto> list = JSONObject.parseArray(resultRecord.getFlowStaffIdRole(), StaffRoleDto.class);
+                        if (CollectionUtils.isNotEmpty(list)) {
+                            StaffRoleDto staffRoleDto = list.get(0);
+                            StaffEntity approvalStaff = staffService.selectStaffById(staffRoleDto.getStaffId());
+                            resultRecord.setCurrentApprovalStaffId(approvalStaff != null ? approvalStaff.getId() : null);
+                            resultRecord.setCurrentApprovalStaffName(approvalStaff != null ? approvalStaff.getName() : null);
+                        }
                         resultRecordService.updateResultRecordById(resultRecord);
                     }
                     if (flowRecord.getId() > req.getRollbackFlowId()) {
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 582add4c..77d4e0a0 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
@@ -428,7 +428,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         resultRecord.setStatus(1); //审批中
         resultRecord.setCurrentApprovalStaffId(approvalStaff != null ? approvalStaff.getId() : null);
         resultRecord.setCurrentApprovalStaffName(approvalStaff != null ? approvalStaff.getName() : null);
-
         resultRecordService.updateResultRecordById(resultRecord);// 更新用户权限
         return R.ok("提交审批成功")
                 .put("from", staff)