YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

测试：-工会修改

Browse Source
This commit is contained in:
赵钊
2025-12-03 17:13:33 +08:00
parent 01177ce7ca
commit 8fe9e6f2f3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/api/model/Guild.php
View File

@@ -129,7 +129,7 @@ class Guild extends Model
if(!$guild_info){ if(!$guild_info){
return ['code' => 0, 'msg' => '该公会不存在', 'data' => null]; return ['code' => 0, 'msg' => '该公会不存在', 'data' => null];
} }
$is_check_join = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'delete_time'=>0])->find(); $is_check_join = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'delete_time'=>0])->order('id desc')->find();
if($is_check_join && $is_check_join['guild_id']!=$guild_id){ if($is_check_join && $is_check_join['guild_id']!=$guild_id){
return ['code'=>0,'msg'=>'您已加入别的工会，请先退出公会再加入', 'data' => null]; return ['code'=>0,'msg'=>'您已加入别的工会，请先退出公会再加入', 'data' => null];
} }
@@ -1022,6 +1022,7 @@ class Guild extends Model
$guild_data['user_avatar'] = localpath_to_netpath($user_data['avatar']); $guild_data['user_avatar'] = localpath_to_netpath($user_data['avatar']);
$guild_data['is_leader'] = $info['user_id'] == $user_id ? 1 : 0;//当前用户是否是会长 $guild_data['is_leader'] = $info['user_id'] == $user_id ? 1 : 0;//当前用户是否是会长
$guild_data['guild_id'] = $info['id']; $guild_data['guild_id'] = $info['id'];
$guild_data['guild_code'] = $info['guild_special_id'];
$guild_data['guild_name'] = $info['guild_name']; $guild_data['guild_name'] = $info['guild_name'];
//加入公会时间 //加入公会时间
$guild_data['join_time'] = date('Y-m-d H:i:s',$guild_user['apply_time']); $guild_data['join_time'] = date('Y-m-d H:i:s',$guild_user['apply_time']);