用户信息更新

application/api/controller/Usercenter.php

@@ -109,9 +109,12 @@ class UserCenter extends Common
             $userInfo['memberinfo'] = $memberinfo;
         }
         //家族信息
-        $guildField = 'id,g_id,user_id,party_id,name,image,desc,member,status';
-        $guildWhere['user_id'] = $user_id;
-        $guildInfo = model('Guild')->field($guildField)->where($guildWhere)->find();
+        $guildField = 'g.id,g.g_id,g.user_id,g.party_id,g.name,g.image,g.desc,g.member,g.status';
+        $guildWhere['gm.user_id'] = $user_id;
+        $guildWhere['g.status'] = 1;
+        $guildInfo = model('Guild')->alias('g')->field($guildField)
+            ->join('guild_member gm','gm.guild_id = g.id','LEFT')
+            ->where($guildWhere)->order('id desc')->find();
         $userInfo['guild_info'] = !empty($guildInfo) ? $guildInfo : [];
         $guildStatus = -2;
         if (!empty($guildInfo)) {

application/common/library/Auth.php

@@ -522,9 +522,12 @@ class Auth
         $userinfo['is_cool'] = isset($user['is_cool']) ? $user['is_cool'] : 0;
         $userinfo['is_manager'] = isset($user['is_manager']) ? $user['is_manager'] : 0;
         //家族信息
-        $guildField = 'id,g_id,user_id,party_id,name,image,desc,member,status';
-        $guildWhere['user_id'] = $this->_user->id;
-        $guildInfo = model('Guild')->field($guildField)->where($guildWhere)->order('id desc')->find();
+        $guildField = 'g.id,g.g_id,g.user_id,g.party_id,g.name,g.image,g.desc,g.member,g.status';
+        $guildWhere['gm.user_id'] = $this->_user->id;
+        $guildWhere['g.status'] = 1;
+        $guildInfo = model('Guild')->alias('g')->field($guildField)
+            ->join('guild_member gm','gm.guild_id = g.id','LEFT')
+            ->where($guildWhere)->order('id desc')->find();
         $userinfo['guild_info'] = !empty($guildInfo) ? $guildInfo : [];
         $guildStatus = -2;
         if (!empty($guildInfo)) {