From 72d0bdcd0d3d288882c2c2db553a478152e26603 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 12 Nov 2020 19:37:28 +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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 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 bb577eb8..92c57ac1 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
@@ -1171,7 +1171,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             StaffEntity staffEntity = staffService.selectStaffById(resultComment.getStaffId());
             resultComment.setAvatar(staffEntity.getAvatar());
         }
-
         Map<String,Integer> auth = new HashMap<>();
         auth.put("showResult",1);
         auth.put("showScore",1);
@@ -1202,6 +1201,14 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 }
             }
         }
+
+        for(FlowRecordResp flowRecordResp : flowRecordList){
+            List<FlowDetailResp>  flowDetailResps = flowRecordResp.getFlowDetailRespList();
+            if(flowDetailResps !=null && flowDetailResps.size() ==1 ){
+                auth.put("transfer",flowDetailResps.get(0).getTransfer());
+                auth.put("tiaozhuang",flowDetailResps.get(0).getTiaozhuang());
+            }
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("flowRecordList", flowRecordList);
         map.put("resultCommentList", resultCommentList);
@@ -1244,7 +1251,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         flowDetailResp.setAvatar(staffEntity.getAvatar());
         DepartmentsEntity departmentsEntity = departmentsDao.selectByDepartmentId(departmentsStaffRelateEntity.getDepartmentId());
         flowDetailResp.setDepartName(departmentsEntity.getDepartmentName());
-        if(new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus()) ){
+        if((new Integer(0).equals(flowRecord.getStatus()) || new Integer(2).equals(flowRecord.getStatus())) && flowRecord.getFlowProcess() != 0  ){
             int position = 0 ;
             StaffRole staffRole = staffRoleService.selectStaffRolesByStaffIdDepartmentLevelList(loginUserId,
                     Arrays.asList(new String[]{RoleEnums.CHILD_PM.getName(),RoleEnums.MASTER_PM.getName()}));