diff --git a/application/api/controller/Room.php b/application/api/controller/Room.php
index 33aa5193..b78ecd98 100644
--- a/application/api/controller/Room.php
+++ b/application/api/controller/Room.php
@@ -15,6 +15,7 @@ class Room extends BaseCom
         $room_name = input('room_name', '');
         $room_cover = input('room_cover', '');
         $room_intro = input('room_intro', '');
+        $password = input('room_password');
 
         $signCount = db::name('vs_user_sign')->where(['parent_user_id' => $this->uid ,'end_time' => ['>', time()]] )->count();
         $num = get_system_config_value('sign_num_per_room');
@@ -25,7 +26,7 @@ class Room extends BaseCom
 
         $key_name = "api:room:user_create_room:" . $this->uid;
         redis_lock_exits($key_name);
-        $reslut = model('Room')->user_create_room($this->uid, $room_name, $room_cover, $room_intro,0,0);
+        $reslut = model('Room')->user_create_room($this->uid, $room_name, $room_cover, $room_intro,0,0,$password);
         redis_unlock($key_name);
 
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index ca5bf30d..618a54cc 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -18,7 +18,7 @@ class Room extends Model
 
     }
     //创建房间 创建
-    public function user_create_room($uid, $room_name,$room_cover,$room_intro,$type = 0,$need_apply=1)
+    public function user_create_room($uid, $room_name,$room_cover,$room_intro,$type = 0,$need_apply=1,$password = '')
     {
         $user_mobile = model('api/User')->where('id', $uid)->value('mobile');
         if ($user_mobile == null) {
@@ -62,6 +62,9 @@ class Room extends Model
                 $data['is_open_blind_box_turntable'] = 1;
             }
             $data['label_id'] = 1;
+            if(!empty($password)){
+                $data['room_password'] = $password;
+            }
         }elseif ($type == 7){//互娱房创建的私密电影屋
             $data['room_number'] = $this->get_user_code();
             $data['type_id'] = 6;//cp电影房
@@ -173,6 +176,8 @@ class Room extends Model
         }
         if($password){
             $data['room_password'] = $password;
+        }else{
+            $data['room_password'] = '';
         }
         if(!empty($data)){
             $reslut = $this->where('id', $room_id)->update($data);
@@ -958,7 +963,7 @@ class Room extends Model
             return ['code' => 202, 'msg' => '您已经在房间'.$room_names.'中，请先下麦后并退出房间', 'data' => ['room_id' => $room_pit,'msg'=>'您在'.$room_names .'房间游戏中，不支持进入新房间']];
         }
 
-        if($room['room_password'] != ''){
+        if($room['room_password'] != '' && $user_id != $room['user_id']){
             return ['code' => 101, 'msg' => '密码房',  'data' => ''];
         }