From 0d2a3cbe360496f241d491b3417c7ab5116937cc Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 2 Sep 2016 16:00:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_forge.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index d08396e16..09f399cc9 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -1,4 +1,4 @@
-<% if ma.class == ForgeMessage && ma.forge_message %>
+<% if ma.class == ForgeMessage %>
     <!--申请加入项目-->
     <% if ma.forge_message_type == "AppliedProject" %>
         <ul class="homepageNewsList fl">
@@ -130,7 +130,7 @@
             </ul>
         <% end %>
     <% end %>
-    <% if ma.forge_message_type == "Journal" %>
+    <% if ma.forge_message_type == "Journal" && ma.forge_message %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %></a>