合并分支 'Branch_liuzhen' 到 'master'

加入社区接口调整



查看合并请求 !207

@@ -490,7 +490,10 @@ class House extends Api
             $this->error($validate->getError());
             $this->error($validate->getError());
         }
         }
 
 
-        $info = Db::name('user_house')->where('user_id',$param['user_id'])->where('house_id',$param['house_id'])->find();
+        $info = Db::name('user_house')->where('user_id',$param['user_id'])
+            ->where('house_id',$param['house_id'])
+            ->where('status',['in',[1,2]])
+            ->find();
         if(empty($info)){
         if(empty($info)){
             $param['createtime'] = time();
             $param['createtime'] = time();
             $param['updatetime'] = time();
             $param['updatetime'] = time();