diff --git a/application/api/model/User.php b/application/api/model/User.php index 63f64c9..27cc910 100644 --- a/application/api/model/User.php +++ b/application/api/model/User.php @@ -215,6 +215,17 @@ class User extends Model $user_info['market_value_coin'] = $coin_market_value[0]; $user_info['market_value_market'] = $coin_market_value[1]; + //用户所属工会 + $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$uid,'delete_time'=>0,'status' => 1])->value('guild_id'); + if($guild_id){ + $user_info['guild_id'] = $guild_id; + $user_info['guild_name'] = db::name('vs_guild')->where(['id'=>$guild_id])->value('guild_name'); + }else{ + $user_info['guild_id'] = null; + $user_info['guild_name'] = null; + } + + return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info]; } @@ -407,9 +418,11 @@ class User extends Model //用户所属工会 $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$uid,'status'=>1,'delete_time'=>0])->value('guild_id'); if($guild_id){ - $user_info['guild'] = Db::name('vs_guild')->where('id' ,$guild_id)->value('guild_name'); + $user_info['guild_id'] = $guild_id; + $user_info['guild_name'] = db::name('vs_guild')->where(['id'=>$guild_id])->value('guild_name'); }else{ - $user_info['guild'] = ''; + $user_info['guild_id'] = null; + $user_info['guild_name'] = null; } $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image $user_info['nobility_image'] = $Nobility['play_image'];