From 75643b818120c7e99f345d4426a15d894a755b87 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 15 May 2015 10:17:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=AA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2user=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/user.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/api/mobile/entities/user.rb b/app/api/mobile/entities/user.rb
index 6b0064036..aee687dc9 100644
--- a/app/api/mobile/entities/user.rb
+++ b/app/api/mobile/entities/user.rb
@@ -9,7 +9,7 @@ module Mobile
             u[f]
           elsif u.is_a?(::User)
             if u.respond_to?(f)
-              u.send(f)
+              u.send(f)  unless u.user_extensions.nil?
             else
               case f
                 when :img_url
@@ -17,9 +17,9 @@ module Mobile
                 when :gender
                   u.nil? || u.user_extensions.nil? || u.user_extensions.gender.nil? ? 0 : u.user_extensions.gender
                 when :work_unit
-                  get_user_work_unit u
+                  get_user_work_unit u  unless u.user_extensions.nil?
                 when :location
-                  get_user_location u
+                  get_user_location u  unless u.user_extensions.nil?
                 when :brief_introduction
                   u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.brief_introduction
               end