From 90d2c5437b0e56f56955f0ff43fcc57d214a592f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 30 Jul 2020 16:38:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=92=E7=BB=9D=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/WorkActUserServiceImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
index 8ac5edd27a..f59170c609 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
@@ -320,6 +320,8 @@ public class WorkActUserServiceImpl implements WorkActUserService {
                 historicalAuditResult.setLatestAuditTime(latestRefused.getCreatedTime());
                 historicalAuditResult.setLatestRefusedReason(latestRefused.getReason());
                 historicalAuditResult.setRefusedCountDesc(String.format("已拒绝%s次",refusedCount));
+                resultDTO.setLatestAuditTime(latestRefused.getCreatedTime());
+                resultDTO.setLatestRefusedReason(latestRefused.getReason());
                 resultDTO.setHistoricalAuditResult(historicalAuditResult);
             }
         }else if(ActConstant.ACT_USER_STATUS_PASSED.equals(resultDTO.getStatus())||ActConstant.ACT_USER_STATUS_REFUSED.equals(resultDTO.getStatus())){
@@ -451,7 +453,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         actUserLogEntity.setActId(actUserRelationEntity.getActId());
         actUserLogEntity.setUserId(actUserRelationEntity.getUserId());
         actUserLogEntity.setOperationType(ActConstant.ACT_USER_LOG_OPER_REFUSED);
-        actUserLogEntity.setReason(StrConstant.EPMETY_STR);
+        actUserLogEntity.setReason(formDTO.getRejectReason());
         actUserLogEntity.setCreatedTime(auditTime);
         //插入一条日志
         actUserLogDao.insert(actUserLogEntity);