From 080900fe49b76fe0f5a9cce59dcc990d36a32061 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 10 Dec 2020 09:56:39 +0800
Subject: [PATCH] rjuq whnt

---
 .../com/lz/modules/app/controller/StaffRoleController.java     | 3 +++
 src/main/java/com/lz/modules/app/dto/TaskCommentDto.java       | 1 +
 .../com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java
index 2ecc3668..7815c27a 100644
--- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java
+++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java
@@ -269,6 +269,9 @@ public class StaffRoleController extends AbstractController {
     //http://localhost:8080/lz_management/user/lzstaffrole/comment/list?detailId=4917&pageSize=2
     @RequestMapping("/comment/list")
     public R commentList(TaskModel taskModel) {
+        if(taskModel.getStaffId() == null && getUser()!=null && getUserId() !=null){
+            taskModel.setStaffId(getUserId());
+        }
         return staffRoleService.commentList(taskModel);
     }
 
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 8c35321f..f82b962a 100644
--- a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java
+++ b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java
@@ -5,4 +5,5 @@ import lombok.Data;
 
 @Data
 public class TaskCommentDto extends TaskComment {
+    private int isSelf;
 }
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 52a70d59..c3eb938f 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
@@ -655,6 +655,9 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
         for (TaskComment taskComment : taskComments) {
             TaskCommentDto taskCommentDto = new TaskCommentDto();
             BeanUtils.copyProperties(taskComment, taskCommentDto);
+            if(taskComment.getStaffId().equals(taskModel.getStaffId())){
+                taskCommentDto.setIsSelf(1);
+            }
             taskCommentDtoList.add(taskCommentDto);
         }
         pageUtils.setList(taskCommentDtoList);