From 1d66791b21d54c6894c112c0c7186dca744aa896 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 11 Dec 2020 14:30:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lz/modules/app/dto/TaskCommentDto.java    |  1 +
 .../lz/modules/app/service/StaffOccupationService.java |  1 +
 .../flow/service/impl/StaffRoleServiceImpl.java        | 10 ++++++++++
 3 files changed, 12 insertions(+)

diff --git a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java
index fb3ae5a8..09d5b6c2 100644
--- a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java
+++ b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java
@@ -21,5 +21,6 @@ public class TaskCommentDto  {
     private String atStaffNames;
     private String avatar;
     private String taskName;
+    private String position;//
 
 }
diff --git a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java
index 893e07f1..179634df 100644
--- a/src/main/java/com/lz/modules/app/service/StaffOccupationService.java
+++ b/src/main/java/com/lz/modules/app/service/StaffOccupationService.java
@@ -38,5 +38,6 @@ public interface StaffOccupationService extends IService<StaffOccupationEntity>
     List<StaffOccupationEntity> selectAll();
 
     List<StaffTypeDto> selectStaffTypesByStaffIds(List<Long> staffIds);
+
 }
 
diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
index 433d2f59..167ed415 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
@@ -13,6 +13,7 @@ import com.lz.modules.app.dto.*;
 import com.lz.modules.app.entity.DepartmentsEntity;
 import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
 import com.lz.modules.app.entity.StaffEntity;
+import com.lz.modules.app.entity.StaffOccupationEntity;
 import com.lz.modules.app.enums.DepartmentPMEnums;
 import com.lz.modules.app.enums.EvaluationGroupEnums;
 import com.lz.modules.app.enums.RoleEnums;
@@ -21,6 +22,7 @@ import com.lz.modules.app.model.RoleModel;
 import com.lz.modules.app.model.TaskModel;
 import com.lz.modules.app.service.DepartmentsService;
 import com.lz.modules.app.service.DepartmentsStaffRelateService;
+import com.lz.modules.app.service.StaffOccupationService;
 import com.lz.modules.flow.dao.RecordRoleMapper;
 import com.lz.modules.flow.dao.StaffRoleDepartmentMapper;
 import com.lz.modules.flow.dao.StaffRoleMapper;
@@ -123,6 +125,9 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
     @Autowired
     private TaskCommentMapper taskCommentMapper;
 
+    @Autowired
+    private StaffOccupationService staffOccupationService;
+
     @Override
     public StaffRole selectStaffRoleById(Long id) {
         return staffRoleMapper.selectStaffRoleById(id);
@@ -692,8 +697,13 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
                     taskCommentDto.setTaskName(resultTask.getName());
                 }
             }
+            StaffOccupationEntity staffOccupationEntity = staffOccupationService.getStaffOccupationByStaffId(staffEntity.getId());
+            if(staffOccupationEntity !=null ){
+                taskCommentDto.setPosition(staffOccupationEntity.getPosition());
+            }
             taskCommentDtoList.add(taskCommentDto);
         }
+
         pageUtils.setList(taskCommentDtoList);
         return R.ok().put("data", pageUtils);
     }