zhangxiaobin 1 рік тому
батько
коміт
969538ce7f

+ 1 - 2
application/api/controller/Usercenter.php

@@ -98,13 +98,12 @@ class UserCenter extends Common
         }
         //家族信息
         $guildField = 'id,g_id,user_id,party_id,name,image,desc,member,status';
-        $guildWhere['status'] = 1;
         $guildWhere['user_id'] = $user_id;
         $guildInfo = model('Guild')->field($guildField)->where($guildWhere)->find();
         $userInfo['guild_info'] = !empty($guildInfo) ? $guildInfo : [];
         $guildStatus = -2;
         if (!empty($guildInfo)) {
-            $guildStatus = $guildInfo['status'];
+            $guildStatus = (int)$guildInfo['status'];
         }
         $userInfo['guild_status'] = $guildStatus;//家族状态:公会状态:0=待审核,1=正常,-1=已解散,-2无公会
         //动态

+ 2 - 3
application/common/library/Auth.php

@@ -493,13 +493,12 @@ class Auth
         $userinfo['bind_bank'] = !empty($userBank) ? 1 : 0;
         //家族信息
         $guildField = 'id,g_id,user_id,party_id,name,image,desc,member,status';
-        $guildWhere['status'] = 1;
         $guildWhere['user_id'] = $this->_user->id;
-        $guildInfo = model('Guild')->field($guildField)->where($guildWhere)->find();
+        $guildInfo = model('Guild')->field($guildField)->where($guildWhere)->order('id desc')->find();
         $userinfo['guild_info'] = !empty($guildInfo) ? $guildInfo : [];
         $guildStatus = -2;
         if (!empty($guildInfo)) {
-            $guildStatus = $guildInfo['status'];
+            $guildStatus = (int)$guildInfo['status'];
         }
         $userinfo['guild_status'] = $guildStatus;//家族状态:公会状态:0=待审核,1=正常,-1=已解散,-2无公会