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 74fe4bee..ed61090c 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 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 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); } @@ -532,10 +534,13 @@ public class ResultRecordServiceImpl extends ServiceImpl