1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -260,9 +260,15 @@ public class TaskController {
             List<TaskExecutor> hasRemoveExecutor = oldExeList.stream().filter(old -> !task.getExecutorList().stream().anyMatch(newT -> newT.getId() != null && newT.getId().equals(old.getId()))).collect(Collectors.toList());
             if(hasRemoveExecutor.size()>0){
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                    taskCommentString.append(",移除了执行人["+hasRemoveExecutor.stream().map(h->"$userName="+h.getExecutorName()+"$").collect(Collectors.joining(","))+"]");
+                    taskCommentString.append(",移除了执行人"+hasRemoveExecutor.stream().map(h->{
+                        if(!h.getExecutorId().equals(user.getId())){
+                            return "$userName="+h.getExecutorName()+"$";
+                        }else {
+                            return h.getExecutorName();
+                        }
+                    }).collect(Collectors.joining(",")));
                 }else {
-                    taskCommentString.append(",移除了执行人["+hasRemoveExecutor.stream().map(TaskExecutor::getExecutorName).collect(Collectors.joining(","))+"]");
+                    taskCommentString.append(",移除了执行人"+hasRemoveExecutor.stream().map(TaskExecutor::getExecutorName).collect(Collectors.joining(",")));
                 }
 
             }
@@ -280,9 +286,15 @@ public class TaskController {
                 List<TaskExecutor> newAddExecutor = task.getExecutorList().stream().filter(newT -> !StringUtils.isEmpty(newT.getExecutorId()) && !oldExeList.stream().anyMatch(old -> newT.getExecutorId().equals(old.getExecutorId()))).collect(Collectors.toList());
                 if(newAddExecutor.size()>0){
                     if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                        taskCommentString.append(",新增了执行人["+newAddExecutor.stream().map(h->"$userName="+h.getExecutorName()+"$").collect(Collectors.joining(","))+"]");
+                        taskCommentString.append(",新增了执行人"+newAddExecutor.stream().map(h->{
+                            if(!h.getExecutorId().equals(user.getId())){
+                                return "$userName="+h.getExecutorName()+"$";
+                            }else {
+                                return h.getExecutorName();
+                            }
+                        }).collect(Collectors.joining(",")));
                     }else {
-                        taskCommentString.append(",新增了执行人["+newAddExecutor.stream().map(TaskExecutor::getExecutorName).collect(Collectors.joining(","))+"]");
+                        taskCommentString.append(",新增了执行人"+newAddExecutor.stream().map(TaskExecutor::getExecutorName).collect(Collectors.joining(",")));
                     }
                 }
                 for (TaskExecutor oldHa : oldHas) {
@@ -290,9 +302,13 @@ public class TaskController {
                     if(first.isPresent()){
                         if(!oldHa.getPlanHours().equals(first.get().getPlanHours())){
                             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
-                                taskCommentString.append(",修改了执行人["+"$userName"+oldHa.getExecutorName()+"$"+"]计划工时为"+oldHa.getPlanHours()+"小时");
+                                if(oldHa.getExecutorId().equals(user.getId())){
+                                    taskCommentString.append(",修改了执行人"+oldHa.getExecutorName()+"计划工时为"+oldHa.getPlanHours()+"小时");
+                                }else {
+                                    taskCommentString.append(",修改了执行人"+"$userName"+oldHa.getExecutorName()+"$"+"计划工时为"+oldHa.getPlanHours()+"小时");
+                                }
                             }else {
-                                taskCommentString.append(",修改了执行人["+oldHa.getExecutorName()+"]计划工时为"+oldHa.getPlanHours()+"小时");
+                                taskCommentString.append(",修改了执行人"+oldHa.getExecutorName()+"计划工时为"+oldHa.getPlanHours()+"小时");
                             }
                         }
                     }