From 0049f921b94d7ddb2359e63664837b86dc28827e Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 22 Nov 2014 09:51:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=8A=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=89=88--=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE--?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE--=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=9A=E5=A6=82=E5=9B=BE=EF=BC=8C=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=90=84=E7=94=A8=E6=88=B7=E7=9A=84=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E5=85=A8=E9=83=A8=E4=B8=BA=E7=A9=BA=E4=BA=86=E3=80=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: alan <547533434@qq.com>
---
 app/models/user.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index a9d73bd31..fe6222359 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -230,7 +230,12 @@ class User < Principal
 
   #选择项目成员时显示的用户信息文字
   def userInfo
-   info=self.nickname + '   (' + self.realname + ')';
+    if self.realname.gsub(' ','') == "" || self.realname.nil?
+      info = self.nickname;
+    else
+      info=self.nickname + '   (' + self.realname + ')';
+    end
+    info
   end
   
    ###添加留言   fq