diff --git a/application/api/controller/Guild.php b/application/api/controller/Guild.php index dfd0320..62645c9 100644 --- a/application/api/controller/Guild.php +++ b/application/api/controller/Guild.php @@ -201,7 +201,7 @@ class Guild extends BaseCom */ public function get_guild_info(){ $uid = $this->uid; - $guild_id = input('guild_id', 0); + $guild_id = input('guild_id', ''); $reslut = model('Guild')->guild_info($guild_id,$uid); return V($reslut['code'],$reslut['msg'], $reslut['data']); } diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php index 75e4e86..cd20814 100644 --- a/application/api/model/Guild.php +++ b/application/api/model/Guild.php @@ -964,12 +964,22 @@ class Guild extends Model /* * 群聊详情 */ - public function guild_info($guild_id,$user_id=0){ - if(!$guild_id){ + public function guild_info($guild_ids,$user_id=0){ + if(!$guild_ids){ return ['code' => 0, 'msg' => '参数错误']; } - $guild_info = db::name('vs_guild')->where(['id'=>$guild_id,'status'=>1,'delete_time'=>0])->find(); - $group_member_info = model('Tencent')->get_group_info('g'.$guild_id); + //获取$guild_id的第一个字母 + $guild_id_first_letter = substr($guild_ids, 0, 1); + $guild_id = substr($guild_ids, 1); + if($guild_id_first_letter == 'g'){ + $guild_info = db::name('vs_guild')->where(['id'=>$guild_id,'status'=>1,'delete_time'=>0])->find(); + $cover = $guild_info['cover']; + }else{ + $guild_info = db::name('vs_family')->where(['id'=>$guild_id])->find(); + $cover = null; + } + + $group_member_info = model('Tencent')->get_group_info($guild_ids); if($group_member_info['code']!=1){ return ['code' => 0, 'msg' => '群聊不存在',null]; } @@ -980,7 +990,7 @@ class Guild extends Model } $return_data =[ 'guild_id' => $guild_id, - 'guild_cover' => $guild_info['cover'], + 'guild_cover' => $cover, 'is_deacon' => $is_deacon, 'user_list' => $user_list['data']['list'], 'name' => $group_member_info['data'][0]['Name'],