From f4e4f742761ad1adac5857775a7de1480934d601 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, 13 Nov 2020 11:46:45 +0800
Subject: [PATCH] fix

---
 src/main/java/com/lz/modules/performance/dto/TaskListDto.java | 4 ++--
 .../modules/performance/service/impl/AssessServiceImpl.java   | 4 ++--
 src/main/resources/mapper/flow/FlowRecordMapper.xml           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/dto/TaskListDto.java b/src/main/java/com/lz/modules/performance/dto/TaskListDto.java
index e8cdae92..e3f09d6c 100644
--- a/src/main/java/com/lz/modules/performance/dto/TaskListDto.java
+++ b/src/main/java/com/lz/modules/performance/dto/TaskListDto.java
@@ -14,9 +14,9 @@ public class TaskListDto {
 
     private Long recordId;
 
-    private Long staffId;
+    private Long recordStaffId;
 
-    private Long currentApprovalStaffId;
+    private Long approvalStaffId;
 
     private Long startId;
 
diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
index edbcf607..6e3df194 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
@@ -68,10 +68,10 @@ public class AssessServiceImpl implements AssessService {
         List<TaskListDto> dtos = pageUtils.getList();
         dtos.stream().forEach(taskListDto -> {
             TaskListRes res = new TaskListRes();
-            StaffEntity staffEntity = staffService.selectStaffById(taskListDto.getStaffId());
+            StaffEntity staffEntity = staffService.selectStaffById(taskListDto.getRecordStaffId());
             res.setAvatar(Optional.ofNullable(staffEntity.getAvatar()).orElse(StringUtil.EMPTY));
             String name = staffEntity.getName();
-            if(taskListDto.getStaffId().equals(taskListDto.getCurrentApprovalStaffId())){
+            if(taskListDto.getRecordStaffId().equals(taskListDto.getApprovalStaffId())){
                 name = "您";
             }
             FlowStart start = flowStartService.selectFlowStartById(taskListDto.getStartId());
diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml
index 1e2c003c..0ae60ceb 100644
--- a/src/main/resources/mapper/flow/FlowRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml
@@ -186,7 +186,7 @@
     </select>
 
     <select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
-        SELECT DISTINCT(record_id),f.flow_process,f.flow_name,current_approval_staff_id,staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f
+        SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f
         LEFT JOIN lz_result_record r
         ON f.record_id = r.id
         where f.is_delete=0 and r.is_delete=0