From 964738f2031636cda5bd28a936a02c9754cec6dd Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 19 Sep 2015 11:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E7=9A=84ti?=
 =?UTF-8?q?ps=E4=B8=AD=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=B0=B1=E4=B8=8D=E6=98=BE=E7=A4=BA=E2=80=9C=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index a5cc70f99..b9e626f2d 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -64,10 +64,8 @@
                 <% unless usm.subject.nil? %>
                     <p><strong>标题：</strong><%= usm.subject %></p>
                 <% end %>
-                <% if usm.description.nil? && usm.content.nil? %>
-
-                <% else %>
-                    <div class="fl"><strong>内容：</strong></div><div class="ml36"><%= usm.description.html_safe %></div>
+                <% if (!usm.description.nil? && usm.description != "") || (!usm.content.nil? && usm.content != "") %>
+                    <div class="fl"><strong>内容：</strong></div><div class="ml36"><%= usm.description.nil? ? usm.content.html_safe : usm.description.html_safe %></div>
                 <% end %>
               </div>
               <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>