From 9b8c07648e957ff6c78091bb89c046243f9fb755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Tue, 15 Dec 2020 10:42:21 +0800
Subject: [PATCH] fix

---
 .../performance/service/impl/ResultTaskServiceImpl.java        | 1 +
 .../performance/service/impl/TaskProcessRecordServiceImpl.java | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
index d2ea4ebd..27fccbc4 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
@@ -124,6 +124,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 						if(staffEntity1 !=null){
 							resultTaskDto.setAvatar(staffEntity1.getAvatar());
 							resultTaskDto.setStaffName(staffEntity1.getName());
+
 						}
 
 					}
diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
index f07449bd..88587f07 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
@@ -148,7 +148,10 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
                     Optional.ofNullable(staffEntity).ifPresent(staffEntity12 -> {
                         dto.setAvatar(staffEntity12.getAvatar());
                         dto.setStaffName(staffEntity12.getName());
+						StaffOccupationEntity staffOccupation= staffOccupationService.getStaffOccupationByStaffId(staffEntity12.getId());
+						Optional.ofNullable(staffOccupation).ifPresent(staffOccupationEntity -> dto.setPosition(staffOccupationEntity.getPosition()));
                     });
+
 				}
 			}