diff --git a/application/api/controller/Guild.php b/application/api/controller/Guild.php
index 5f82243..dfd0320 100644
--- a/application/api/controller/Guild.php
+++ b/application/api/controller/Guild.php
@@ -174,9 +174,14 @@ class Guild extends BaseCom
         $uid = $this->uid;
         $reslut = model('Guild')->user_is_join($uid);
         if($reslut==0){
-            return  V(0,'用户不是工会成员');
+            return  V(0,'用户不是工会成员',['guild'=>[]]);
+        }elseif($reslut['status']==2){
+            return  V(0,'用户已申请加入公会待会长审核', ['guild'=>$reslut]);
+        }elseif($reslut['status']==3){
+            return  V(0,'用户加入公会申请已被拒绝', ['guild'=>$reslut]);
+        }elseif($reslut['status']==1){
+            return  V(1,'用户是工会成员', ['guild'=>$reslut]);
         }
-        return  V(1,'用户是工会成员', ['guild_id'=>$reslut]);
     }
 
     /*
diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php
index 7324403..07d684b 100644
--- a/application/api/model/Guild.php
+++ b/application/api/model/Guild.php
@@ -882,11 +882,16 @@ class Guild extends Model
       * @return array
       */
      public function user_is_join($user_id){
-           $guild_id = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'status'=>1,'delete_time'=>0])->value('guild_id');
-           if(empty($guild_id)){
+           $guild = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'delete_time'=>0])->find();
+           if(empty($guild)){
                 return 0;
            }else{
-                return $guild_id;
+               $guild_data['guild_id'] = $guild['guild_id'];
+               $guild_data['status'] = $guild['status'];
+               //1已通过 2已提交 3已拒绝
+               $guild_data['status_str'] = $guild['status'] == 1 ? '已通过' : ($guild['status'] == 2 ? '已提交' : '已拒绝');
+               $guild_data['is_deacon'] = $guild['is_deacon'];
+               return $guild_data;
            }
      }