diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php index 975bde03..897f6a56 100644 --- a/application/api/model/Guild.php +++ b/application/api/model/Guild.php @@ -923,7 +923,17 @@ class Guild extends Model public function get_guild_user_list($guild_ids,$user_id,$page=1,$page_limit=30,$seach=""){ //获取$guild_id的第一个字母 $guild_id_first_letter = substr($guild_ids, 0, 1); - $guild_id = substr($guild_ids, 1); + + if (substr($guild_ids, 0, 2) === 'gg') { + $guild_id = substr($guild_ids, 2); + + } elseif (substr($guild_ids, 0, 1) === 'g') { + $guild_id = substr($guild_ids, 1); + + } else { + $guild_id = substr($guild_ids, 1); + } + $seach_where = []; if($seach){ if(is_numeric($seach)){ @@ -1037,23 +1047,36 @@ class Guild extends Model if(!$guild_ids){ return ['code' => 0, 'msg' => '参数错误']; } - //获取字符串里有几个g - $guild_id_count = substr_count($guild_ids, 'g'); - $guild_id_first_letter = substr($guild_ids, 0, 1); - if($guild_id_count == 2){ - //获取$guild_id的第一个字母 + if (substr($guild_ids, 0, 2) === 'gg') { $guild_id = substr($guild_ids, 2); - }else{ - //获取$guild_id的第一个字母 - $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{ + } elseif (substr($guild_ids, 0, 1) === 'g') { + $guild_id = substr($guild_ids, 1); + $guild_info = db::name('vs_guild')->where(['id'=>$guild_id,'status'=>1,'delete_time'=>0])->find(); + $cover = $guild_info['cover'] ?? ""; + } else { + $guild_id = substr($guild_ids, 1); $guild_info = db::name('vs_family')->where(['id'=>$guild_id])->find(); $cover = db::name('user')->where(['id'=>$guild_info['user_id']])->value('avatar'); } + //获取字符串里有几个g +// $guild_id_count = substr_count($guild_ids, 'g'); +// $guild_id_first_letter = substr($guild_ids, 0, 1); +// if($guild_id_count == 2){ +// //获取$guild_id的第一个字母 +// $guild_id = substr($guild_ids, 2); +// }else{ +// //获取$guild_id的第一个字母 +// $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 = db::name('user')->where(['id'=>$guild_info['user_id']])->value('avatar'); +// } $group_member_info = model('api/Tencent')->get_group_info($guild_ids); if($group_member_info['code']!=1){ @@ -1080,6 +1103,7 @@ class Guild extends Model * 设置群聊信息 */ public function set_guild_info($guild_id,$name,$notice,$avatar){ + $guild_id = 'g'.$guild_id; $return = model('api/Tencent')->modify_group_base_info($guild_id, $name,$avatar, $notice); return ['code' => $return['code'], 'msg' => $return['msg'], 'data' => $return['data']]; }