合并分支 'heshupeng' 到 'master'

1



查看合并请求 !131

@@ -479,13 +479,14 @@ class HouseBoard extends Api
         // 获取记录列表
         // 获取记录列表
         $model = new HouseComment();
         $model = new HouseComment();
         $where_c = [
         $where_c = [
-            'user_id' => $this->auth->id,
-            'house_id' => $house_id,
-            'house_user_id' => $wuye_user_id,
+            'where' => [
+                'user_id' => $this->auth->id,
+                'house_id' => $house_id,
+                'house_user_id' => $wuye_user_id,
+            ],
         ];
         ];
         $order = ['createtime'=>'asc'];
         $order = ['createtime'=>'asc'];
         $comment = $model->pageSelect($page,$where_c,'*',$order,config('option.num'));
         $comment = $model->pageSelect($page,$where_c,'*',$order,config('option.num'));
-        halt($model->getLastSql());
         $list = $comment->items();
         $list = $comment->items();
         $user_model = new \app\api\model\User();
         $user_model = new \app\api\model\User();
         foreach ($list as &$v) {
         foreach ($list as &$v) {