Commit dc9fd305 by 段启岩

消息提醒修复

parent 3c95660a
...@@ -333,9 +333,9 @@ public class MessageListener implements DataItemChangeListener { ...@@ -333,9 +333,9 @@ public class MessageListener implements DataItemChangeListener {
*/ */
if (itemType.equals(DataItemType.BLOG_PRAISE)) { if (itemType.equals(DataItemType.BLOG_PRAISE)) {
BlogPraise blogPraise = blogPraiseService.getById(itemId); BlogPraise blogPraise = blogPraiseService.getById(itemId);
if (!blogPraise.getUserId().equals(operatorId)) { Blog blog = blogService.getById(blogPraise.getTargetId());
if (!blogPraise.getUserId().equals(blog.getUserId())) {
msgType = MessageType.BLOG_PRAISE.getType(); msgType = MessageType.BLOG_PRAISE.getType();
Blog blog = blogService.getById(blogPraise.getTargetId());
toUserId = blog.getUserId(); toUserId = blog.getUserId();
msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的博客<a target='_blank' href='/blog/detail/%s'>《%s》</a>!", msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的博客<a target='_blank' href='/blog/detail/%s'>《%s》</a>!",
fromUser.getUserId(), fromUser.getUserId(),
...@@ -350,9 +350,9 @@ public class MessageListener implements DataItemChangeListener { ...@@ -350,9 +350,9 @@ public class MessageListener implements DataItemChangeListener {
*/ */
if (itemType.equals(DataItemType.PROJECT_PRAISE)) { if (itemType.equals(DataItemType.PROJECT_PRAISE)) {
ProjectPraise projectPraise = projectPraiseService.getById(itemId); ProjectPraise projectPraise = projectPraiseService.getById(itemId);
if (!projectPraise.getUserId().equals(operatorId)) { Project project = projectService.getById(projectPraise.getTargetId());
if (!projectPraise.getUserId().equals(project.getUserId())) {
msgType = MessageType.PROJECT_PRAISE.getType(); msgType = MessageType.PROJECT_PRAISE.getType();
Project project = projectService.getById(projectPraise.getTargetId());
toUserId = project.getUserId(); toUserId = project.getUserId();
msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的项目<a target='_blank' href='/project/detail/%d'>《%s》</a>!", msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的项目<a target='_blank' href='/project/detail/%d'>《%s》</a>!",
fromUser.getUserId(), fromUser.getUserId(),
...@@ -367,9 +367,9 @@ public class MessageListener implements DataItemChangeListener { ...@@ -367,9 +367,9 @@ public class MessageListener implements DataItemChangeListener {
*/ */
if (itemType.equals(DataItemType.QUESTION_PRAISE)) { if (itemType.equals(DataItemType.QUESTION_PRAISE)) {
QuestionPraise questionPraise = questionPraiseService.getById(itemId); QuestionPraise questionPraise = questionPraiseService.getById(itemId);
if (!questionPraise.getUserId().equals(operatorId)) { Question question = questionService.getById(questionPraise.getTargetId());
if (!questionPraise.getUserId().equals(question.getUserId())) {
msgType = MessageType.QUESTION_PRAISE.getType(); msgType = MessageType.QUESTION_PRAISE.getType();
Question question = questionService.getById(questionPraise.getTargetId());
toUserId = question.getUserId(); toUserId = question.getUserId();
msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的问答<a target='_blank' href='/answer/detail/%s'>《%s》</a>!", msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的问答<a target='_blank' href='/answer/detail/%s'>《%s》</a>!",
fromUser.getUserId(), fromUser.getUserId(),
...@@ -384,9 +384,9 @@ public class MessageListener implements DataItemChangeListener { ...@@ -384,9 +384,9 @@ public class MessageListener implements DataItemChangeListener {
*/ */
if (itemType.equals(DataItemType.POST_PRAISE)) { if (itemType.equals(DataItemType.POST_PRAISE)) {
PostPraise postPraise = postPraiseService.getById(itemId); PostPraise postPraise = postPraiseService.getById(itemId);
if (!postPraise.getUserId().equals(operatorId)) { Post post = postService.getById(postPraise.getTargetId());
if (!postPraise.getUserId().equals(post.getUserId())) {
msgType = MessageType.POST_PRAISE.getType(); msgType = MessageType.POST_PRAISE.getType();
Post post = postService.getById(postPraise.getTargetId());
toUserId = post.getUserId(); toUserId = post.getUserId();
msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的动态《%s》!", msg = String.format("<a target='_blank' href='/u/%s/blog'>%s</a>赞了您的动态《%s》!",
fromUser.getUserId(), fromUser.getUserId(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment