From 3c8547c3bcc20275de0fca8fbf3c6bc2885a47fa Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 6 Nov 2020 09:35: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

---
 src/main/java/com/lz/config/ShiroConfig.java                 | 1 +
 .../sys/service/app/impl/ResultRecordServiceImpl.java        | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java
index 36fedbc9..1fe3d0c6 100644
--- a/src/main/java/com/lz/config/ShiroConfig.java
+++ b/src/main/java/com/lz/config/ShiroConfig.java
@@ -53,6 +53,7 @@ public class ShiroConfig {
         filterMap.put("/webjars/**", "anon");
         filterMap.put("/file/**", "anon");
         filterMap.put("/user/lzstaffrole/role/**", "anon");
+        filterMap.put("/user/lzresultrecord/**", "anon");
         filterMap.put("/test/**", "anon");
         filterMap.put("/druid/**", "anon");
         filterMap.put("/app/**", "anon");
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 01d5c891..bea5b83b 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
@@ -824,6 +824,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     @Override
     ////1 提交审批,审批通过,2 撤回,3 催办,4 跳过,5 驳回，6 申述，7 流程终止，8 转交
     public R newApproval(ApprovalDto approvalDto)  throws Exception{
+        log.info("newApproval args :" + JSON.toJSONString(approvalDto));
         if(approvalDto.getResultRecordId() == null){
             throw  new RRException("resultRecordId 不能为空");
         }
@@ -923,6 +924,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     }
 
     private R newSubmit(ApprovalDto approvalDto,Integer finishedStatus) {
+
         ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId());
         if(approvalDto.getLoginUserId() == null){
             approvalDto.setLoginUserId(resultRecord.getCurrentApprovalStaffId());
@@ -1133,15 +1135,16 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         auth.put("showScore",1);
         auth.put("showResult",1);
         List<FlowRecord> currentResultRecords = flowRecordService.selectFlowRecordByRecordIdStatus(recordDetailDto.getResultRecordId(),2);
+        log.info("当前用户登陆用户 id :" + recordDetailDto.getLoginUserId());
         if(currentResultRecords !=null && currentResultRecords.size() > 0 ){
             FlowRecord currentResultRecord = null;
             for(FlowRecord flowRecord:currentResultRecords){
                 if(flowRecord.getApprovalStaffId().equals(recordDetailDto.getLoginUserId())){
                     currentResultRecord = flowRecord;
+                    log.info("当前审批用户 id id :" + currentResultRecord.getApprovalStaffId());
                     break;
                 }
             }
-
             if(currentResultRecord !=null){
                 if(StringUtil.isNotBlank(currentResultRecord.getFlowStaffIdRole())){
                     Map<String,Object> map = JSONObject.parseObject(currentResultRecord.getFlowStaffIdRole(),Map.class);