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

---
 .../service/impl/TaskProcessRecordServiceImpl.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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 38053a81..e2a430f7 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
@@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -114,8 +116,11 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 			StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId());
 			List<TaskProcessRecordDto> dtos = list;
 			for(TaskProcessRecordDto dto:dtos){
-				dto.setAvatar(staffEntity.getAvatar());
-				dto.setStaffName(staffEntity.getName());
+				Optional.ofNullable(staffEntity).ifPresent(staffEntity1 -> {
+                    dto.setAvatar(staffEntity1.getAvatar());
+                    dto.setStaffName(staffEntity1.getName());
+                });
+
 			}
 		}
 		return pageUtils;