From 6716964d5b2da6e0ab25c269cd869ea3eba3f1a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Thu, 10 Dec 2020 18:50:33 +0800
Subject: [PATCH] fxi

---
 .../service/impl/TaskProcessRecordServiceImpl.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 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 2a2ce79e..38053a81 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
@@ -84,8 +84,10 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 
 	@Override
 	public PageUtils selectTaskProcessRecordsByTaskId(ChangeTaskListReq req) {
+		Long taskId = req.getTaskId();
+		Long detailId = req.getDetailId();
 		PageUtils pageUtils = new PageUtils();
-		if(req.getDetailId()!=null){
+		if(detailId!=null){
 			List<ResultTaskDto> resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(req.getDetailId());
 			if(CollectionUtils.isNotEmpty(resultTaskDtos)){
 				List<Long> collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList());
@@ -103,9 +105,12 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 
 		List list = pageUtils.getList();
 		if(CollectionUtils.isNotEmpty(list)){
-			Long taskId = req.getTaskId();
-			ResultTask resultTask = resultTaskService.selectResultTaskById(taskId);
-			ResultDetail resultDetail = resultDetailService.selectResultDetailById(resultTask.getDetailId());
+
+			if(detailId == null){
+				ResultTask resultTask = resultTaskService.selectResultTaskById(taskId);
+                detailId = resultTask.getDetailId();
+			}
+			ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
 			StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId());
 			List<TaskProcessRecordDto> dtos = list;
 			for(TaskProcessRecordDto dto:dtos){