合并分支 'heshupeng' 到 'master'

1



查看合并请求 !227

@@ -169,8 +169,8 @@ class User extends Api
     		'money',
             'identity'
     	])->toArray();
-        $info = HouseAdminModel::with(['house'])
-            ->where(['user_id'=>$this->auth->id])
+        $info = HouseAdminModel::where(['user_id'=>$this->auth->id])
+            ->where(['house_id'=>$user['house_id']])
             ->order(['is_direct'=>'asc','createtime'=>'asc'])
             ->field('id,house_id,is_direct,nickname,avatar')
             ->find();