From da1faab2530678ca6fef3199584984a0d44a947d Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Mon, 26 Oct 2020 12:27:15 +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        | 5 ++---
 1 file changed, 2 insertions(+), 3 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 18ef1e19..356d9426 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
@@ -759,11 +759,10 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             flowIds.add(flow.getId());
         }
         List<FlowApprovalRole> flowApprovalRoles =flowApprovalRoleService.selectFlowApprovalRoleList(flowIds);
-        List<FlowRecord> flowRecords = new ArrayList<>();
         int i = 0 ;
         DepartmentsStaffRelateEntity relateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(resultRecord.getStaffId());
         Map<String, String> map = departmentsService.selectUserAllDepartmentInFo(relateEntity.getDepartmentId());
-
+        List<FlowRecord> flowRecords = new ArrayList<>();
         for(FlowApprovalRole flowApprovalRole:flowApprovalRoles){
             FlowRecord flowRecord = new FlowRecord();
             flowRecord.setRecordId(resultRecord.getId());
@@ -788,7 +787,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             flowRecord.setFlowName(getFlow(flows,flowApprovalRole.getFlowId()).getOptDesc());
             flowRecord.setRecordStaffId(resultRecord.getStaffId());
             flowRecord.setFlowId(flowApprovalRole.getFlowId());
-            String staffRole = StaffRoles.getStaffRole(resultRecord.getStaffId(), StringUtil.strToLongs(flowApprovalRole.getRoleId()));
+            String staffRole = StaffRoles.getStaffRole(staffEntity.getId(), StringUtil.strToLongs(flowApprovalRole.getRoleId()));
             if(i == 0 ){
                 flowRecord.setStatus(FlowRecordStatusEnums.CURRENT_FLOW_STATUS.getStatus());
                 resultRecord.setFlowStaffIdRole(staffRole);