From 5676f0b82f3939fae37b88b4d8a4e7db31e29b6e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 31 Aug 2016 17:14:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=AF=BC=E8=87=B4=E6=B6=88=E6=81=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_show_messages_list.html.erb | 2 +-
 app/views/users/_user_message_forge.html.erb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 300cc0879..d7887434f 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -115,7 +115,7 @@
             <%= link_to content.html_safe, { :controller=> "my",:action => "account", :flag => 1, :applied_message_id => ma.id }, :title => "系统提示：“#{ma.name}”的申请，经确认为无效的单位信息，已被删除，请重新编辑您的单位资料。谢谢！", :target => '_blank'%>
           </li>
       <% end %>
-    <% elsif ma.class == ForgeMessage %>
+    <% elsif ma.class == ForgeMessage && ma.forge_message %>
       <% if ma.forge_message_type == "AppliedProject" %>
           <li><a href="<%=settings_project_path(:id => ma.project, :tab => "members") %>" target="_blank" title="<%=ma.forge_message.user.show_name %> 申请加入项目：<%= ma.project.name%>"><span class="shadowbox_news_user"><%=ma.forge_message.user.show_name %> </span>申请加入项目：<%= ma.project.name%></a></li>
       <% elsif ma.forge_message_type == "JoinProject" %>
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 7a5fa17c9..d08396e16 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 %>
+<% if ma.class == ForgeMessage && ma.forge_message %>
     <!--申请加入项目-->
     <% if ma.forge_message_type == "AppliedProject" %>
         <ul class="homepageNewsList fl">