From 17bbdde7297e25065c3b23006fcf25911e063026 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 3 Sep 2020 14:42:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=97=B6=E6=8C=89=E7=BA=A7?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=EF=BC=8C=E6=8C=89=E7=BA=A7=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java |  2 +-
 .../sys/service/app/impl/ResultRecordServiceImpl.java | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
index 6581a5c2..98f574f1 100644
--- a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
+++ b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
@@ -9,7 +9,7 @@ public enum WorkMsgTypeEnum {
     //绩效提交审核的通知（自己提交给领导，自己提交给人事，人事提交给老板）
     SUBMIT(0, "绩效提交", "去审核", "# 绩效提交\n  ## @的绩效已经提交"),
     //绩效打回审核的通知
-    REJECT(1, "绩效驳回", "去修改", "# 绩效驳回\n  ## 你的绩效已经驳回"),
+    REJECT(1, "绩效驳回", "去修改", "# 绩效驳回\n  ## @的绩效已经驳回"),
     //绩效通过领导审核的通知，这一步提交到HR，提交的type
     LEADER_PASS(2, "绩效已打分", "去提交给人事", "# 绩效已打分\n  ## 你的绩效已经打分"),
     //绩效通过人事，老板审核的最终审核通知
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 48675d0b..407fc227 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
@@ -507,6 +507,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         } else if (req.getStatus() == 5) { // 驳回
             status = 5;
             List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(req.getRecordResultId());
+            StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId());
+            StaffEntity approvalStaff = mySelf;
             if (flowRecords.size() >= 2) {
                 FlowRecord secondFlowRecord = flowRecords.get(flowRecords.size() - 2);
                 resultRecord.setFlowStaffIdRole(secondFlowRecord.getFlowStaffIdRole());
@@ -514,7 +516,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 List<StaffRoleDto> list = JSONObject.parseArray(resultRecord.getFlowStaffIdRole(), StaffRoleDto.class);
                 if (CollectionUtils.isNotEmpty(list)) {
                     StaffRoleDto staffRoleDto = list.get(0);
-                    StaffEntity approvalStaff = staffService.selectStaffById(staffRoleDto.getStaffId());
+                    approvalStaff = staffService.selectStaffById(staffRoleDto.getStaffId());
                     resultRecord.setCurrentApprovalStaffId(approvalStaff != null ? approvalStaff.getId() : null);
                     resultRecord.setCurrentApprovalStaffName(approvalStaff != null ? approvalStaff.getName() : null);
                 }
@@ -531,10 +533,13 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 lastUsedFlowRecord.setGmtModified(new Date());
                 flowRecordService.insertFlowRecord(lastUsedFlowRecord);// 新插入一条提交记录
 
-                StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId());
+                if(mySelf.getId().longValue() == approvalStaff.getId().longValue()){//同一个人
+                    mySelf.setName("你");//用于替换消息中的@符号。无其他任何作用，不保存
+                }
+
                 r = R.ok("成功")
                         .put("from", mySelf)
-                        .put("to", mySelf)
+                        .put("to", approvalStaff)
                         .put("type", WorkMsgTypeEnum.REJECT);
             }
         }