From 9920612d0dbdedd4610fb3dc042b32904048ecb6 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 14:52:35 +0800
Subject: [PATCH] fix

---
 .../performance/service/impl/TaskProcessRecordServiceImpl.java  | 2 +-
 .../resources/mapper/performance/TaskProcessRecordMapper.xml    | 2 +-
 2 files changed, 2 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 5a26601f..10584681 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
@@ -116,7 +116,6 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 
 		List list = pageUtils.getList();
 		if(CollectionUtils.isNotEmpty(list)){
-
 			if(detailId == null){
 				ResultTask resultTask = resultTaskService.selectResultTaskById(taskId);
                 detailId = resultTask.getDetailId();
@@ -124,6 +123,7 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 			ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
 			StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId());
 			StaffOccupationEntity staffOccupationByStaffId = staffOccupationService.getStaffOccupationByStaffId(resultDetail.getStaffId());
+
 			List<TaskProcessRecordDto> dtos = list;
 			for(TaskProcessRecordDto dto:dtos){
 				dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc());
diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
index aed9a059..481b832f 100644
--- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
+++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
@@ -149,7 +149,7 @@
 
 
     <select id="selectTaskProcessRecordsByTaskIdsAndType" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
-        select gmt_create,remark,label,type from lz_task_process_record  where is_delete = 0
+        select gmt_create,remark,label,type,use_type from lz_task_process_record  where is_delete = 0
         <if test="useType !=null">
             and use_type = #{useType}
         </if>