公会修改

application/api/controller/Guild.php

@@ -789,7 +789,7 @@ class Guild extends Api
         try {
             $id = input('guild_id',0);
             $guildMemberWhere['guild_id'] = $id;
-            $guildMemberWhere['status'] = 1;
+//            $guildMemberWhere['status'] = 1;
             $guildMember = model('GuildMember')->field('id,user_id,role')->where($guildMemberWhere)->select();
             $list = [];
             if (!empty($guildMember)) {

application/common/library/Auth.php

@@ -559,6 +559,7 @@ class Auth
         // 是否设置密码
         $userinfo['is_setpwd'] = $data['password'] ? 1 : 0;
 
+        //
         $field = 'id,age_id,province_id,city_id,desc';
         $fieldArr = explode(',',$field);
         $fieldTextArr = ['age_text','constellation_text','province_text','city_text','friends_num','look_num'];
@@ -567,6 +568,8 @@ class Auth
         foreach ($fieldArr as $key => $value) {
             $userinfo[$value] = isset($user[$value]) ? $user[$value] : '';
         }
+
+        //
         $userAlipay = isset($user['useralipay']) ? $user['useralipay'] : [];
         $userBank = isset($user['userbank']) ? $user['userbank'] : [];
         $userinfo['realname'] = isset($user['userauth']['realname']) ? $user['userauth']['realname'] : '';
@@ -576,7 +579,7 @@ class Auth
         $userinfo['bind_bank'] = !empty($userBank) ? 1 : 0;
         $userinfo['is_cool'] = isset($user['is_cool']) ? $user['is_cool'] : 0;
 
-        //家族信息
+        //公会信息
         $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;
@@ -592,13 +595,15 @@ class Auth
 
 
 
-        //拥有的家族
+        //拥有的公会
         $userinfo['own_guild_id'] = 0;
         $own_guild_id = Db::name('guild')->where('user_id',$this->_user->id)->where('status',1)->value('id');
         if($own_guild_id){
             $userinfo['own_guild_id'] = $own_guild_id;
         }
-        if ($this->power->private_messages == 1 ||$this->power->speak == 1) {
+
+        //
+        /*if ($this->power->private_messages == 1 ||$this->power->speak == 1) {
             $time = time();
             $updateArr = [];
             if ($this->power->private_messages_time < $time) {
@@ -619,7 +624,7 @@ class Auth
         } else {
             $userPower = $this->power;
         }
-        $userinfo['user_power'] = $userPower;
+        $userinfo['user_power'] = $userPower;*/
 
 
         //魅力等级