From 069de498f7981fe5ca60438279b0bebd907c9c15 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 6 Nov 2020 16:07:23 +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

---
 .../app/impl/ResultRecordServiceImpl.java       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 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 2cf31982..8395d1c7 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
@@ -1137,6 +1137,15 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         List<FlowRecord> currentResultRecords = flowRecordService.selectFlowRecordByRecordIdStatus(recordDetailDto.getResultRecordId(),2);
         log.info("当前用户登陆用户 id :" + recordDetailDto.getLoginUserId());
         if(currentResultRecords !=null && currentResultRecords.size() > 0 ){
+            FlowRecord currentFlowRecord = currentResultRecords.get(0);
+            int flowProcess = currentFlowRecord.getFlowProcess();
+            if(flowProcess < 3 ){
+                auth.put("showResult",0);
+            }
+            if( flowProcess < 4 ){
+                auth.put("showScore",0);
+            }
+
             FlowRecord currentResultRecord = null;
             for(FlowRecord flowRecord:currentResultRecords){
                 if(flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId())){
@@ -1146,14 +1155,6 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 }
             }
             if(currentResultRecord !=null){
-                int flowProcess = currentResultRecord.getFlowProcess();
-                if(flowProcess < 3 ){
-                    auth.put("showResult",0);
-                }
-                if( flowProcess < 4 ){
-                    auth.put("showScore",0);
-                }
-
                 if(StringUtil.isNotBlank(currentResultRecord.getFlowStaffIdRole())){
                     Map<String,Object> map = JSONObject.parseObject(currentResultRecord.getFlowStaffIdRole(),Map.class);
                     List<Long> roleIds = null;