Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -68,11 +68,19 @@ public class TaskCommentController {
         String token = request.getHeader("token");
         User user = userMapper.selectById(token);
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id",user.getCompanyId()));
+        List<User> users = userMapper.selectList(new QueryWrapper<User>().eq("company_id",user.getCompanyId()));
         if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
             for (TaskComment taskComment : taskComments) {
+                String userWxId = "";
                 String userName = taskComment.getUserName();
+                for (User item : users) {
+                    if (item.getId().equals(taskComment.getUserId())){
+                        userWxId = user.getCorpwxRealUserid();
+                        break;
+                    }
+                }
                 String content = taskComment.getContent();
-                String newContent = content.replace(userName, "$userName=" + userName + "$");
+                String newContent = content.replace(userName, "$userName=" + userWxId + "$");
                 taskComment.setContent(newContent);
             }
         }