测试：-工会修改

application/api/model/Guild.php

@@ -129,7 +129,7 @@ class Guild extends Model
         if(!$guild_info){
             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){
             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['is_leader'] = $info['user_id'] == $user_id ? 1 : 0;//当前用户是否是会长
             $guild_data['guild_id'] = $info['id'];
+            $guild_data['guild_code'] = $info['guild_special_id'];
             $guild_data['guild_name'] = $info['guild_name'];
             //加入公会时间
             $guild_data['join_time'] = date('Y-m-d H:i:s',$guild_user['apply_time']);