diff --git a/application/api/model/UserMessage.php b/application/api/model/UserMessage.php
index 9bd8b22..b24d9f0 100644
--- a/application/api/model/UserMessage.php
+++ b/application/api/model/UserMessage.php
@@ -104,7 +104,7 @@ class UserMessage extends Model
 
 
         if($type == 1){
-            $where['type'] = $type;
+            $where['type'] = ['in' , [1, 5, 6]];
         }else{
             $where['type'] = ['in' , [3, 4]];
         }
@@ -114,7 +114,6 @@ class UserMessage extends Model
             ->where($where)//1系统消息  3公告下的房间推荐，4公告下的活动'
             ->where('FIND_IN_SET(:user_id, receiving_id)', ['user_id' => $uid])
             ->select();
-
         //自己已经阅读过的信息
         $where['user_id'] = $uid;
         $user_read_message = db::name('user_message')
diff --git a/application/guildadmin/controller/User.php b/application/guildadmin/controller/User.php
index a09a107..aeaf6ce 100644
--- a/application/guildadmin/controller/User.php
+++ b/application/guildadmin/controller/User.php
@@ -69,7 +69,7 @@ class User extends GuildAdmin
         $where['a.status'] = 1;
         $count = db::name('vs_guild_user')->alias('a')->join('user b', 'a.user_id = b.id')->where($where)->count();
         $list = db::name('vs_guild_user')->alias('a')->join('user b', 'a.user_id = b.id')
-            ->field('a.id, a.user_id, a.guild_id, a.room_id, b.status, b.nickname, b.avatar,b.user_code,b.sex,b.mobile,a.createtime,a.settlement_ratio')
+            ->field('a.id, a.user_id, a.guild_id, a.room_id,a.is_deacon,b.status, b.nickname, b.avatar,b.user_code,b.sex,b.mobile,a.createtime,a.settlement_ratio,a.quit_type')
             ->where($where)
             ->order('id desc')
             ->page($page, $page_limit)
@@ -84,6 +84,8 @@ class User extends GuildAdmin
                 $list_data[$k]['sex'] = '未知';
             }
             $list_data[$k]['mobile'] = $item['mobile'];
+            //是否是会长
+            $list_data[$k]['is_deacon'] = $item['is_deacon'];
             //粉丝数量
             $list_data[$k]['fans_num'] = db::name('user_follow')->where(['follow_id' => $item['user_id'],'type'=>1])->count();
             if($search_stime==""){
@@ -105,6 +107,9 @@ class User extends GuildAdmin
             //状态 1正常，2禁止登录，0注销
             $list_data[$k]['status'] = $item['status'];
             $list_data[$k]['status_text'] = $item['status'] == 1 ? '正常' : ($item['status'] == 2 ? '禁止登录' : '注销');
+            //用户工会状态
+            $list_data[$k]['guild_status'] = $item['quit_type'];
+            $list_data[$k]['guild_status_text'] = $item['quit_type'] == 0 ? '正常' : (in_array($item['quit_type'],[1,4]) ? '退出' : '踢出');
         }
         $return_data =[
             'page'      => $page,
@@ -197,7 +202,7 @@ class User extends GuildAdmin
         if(!$guild_user){
             return V(0,"参数错误");
         }
-        $result =  model('api/Guild')->operate_guild($id, $status,$remarks);
+        $result =  model('api/Guild')->operate_guild($id, $status,0,$remarks);
         if($result['code'] == 1){
             return V(1,"操作成功");
         }else{
@@ -316,5 +321,62 @@ class User extends GuildAdmin
             return V(0,$result['msg']);
         }
     }
-
+    //邀请用户加入工会
+    public function invite_user_join_guild(){
+        $guild_id = $this->guildId;
+        $user_code = input('user_code','');
+        $mobile = input('mobile','');
+        if(!$user_code){
+            return V(0,"参数错误");
+        }
+        if(!$mobile){
+            return V(0,"请输入手机号");
+        }
+        $user = db::name('user')->where(['user_code'=>$user_code])->find();
+        if(!$user){
+            return V(0,"用户不存在");
+        }
+        if($user['mobile']!=$mobile){
+            return V(0,"此手机号用用户不一致");
+        }
+        $user_id = $user['id'];
+        $guild = db::name('vs_guild')->where(['id'=>$guild_id])->find();
+        $guild_user =  db::name('vs_guild_user')->where(['user_id'=>$user_id])->find();
+        if($guild_user){
+            if($guild_user['guild_id'] == $guild_id){
+                return V(0,"该用户已加入工会");
+            }else{
+                return V(0,"该用户已加入其它工会");
+            }
+        }
+        $result =  db::name('vs_guild_user_invited')->where(['user_id'=>$user_id])->find();
+        if($result && $result['status'] == 0){
+            return V(0,"该用户已发送邀请,请等待对方同意");
+        }
+        $data =[];
+        //发送系统消息
+        $data['type'] = 6;
+        $data['title'] = '工会邀请';
+        $data['admin_id'] = Session::get('admin_id');
+        $data['receiving_id'] = $user_id;
+        $data['content'] = $guild['guild_name'].' 公会邀请您加入工会呢，您是否同意！';
+        $data['createtime'] = time();
+        $res = db::name('system_message')->insertGetId($data);
+        if(!$res){
+            return V(0,"操作失败");
+        }
+        $result =  db::name('vs_guild_user_invited')->insert([
+            'user_id' => $user_id,
+            'mobile' => $mobile,
+            'guild_id' => $guild_id,
+            'status' => 0,
+            'message_id' => $res,
+            'createtime' => time()
+        ]);
+        if($result){
+            return V(1,"操作成功");
+        }else{
+            return V(0,"操作失败");
+        }
+    }
 }