Merge branch 'master' of http://114.215.101.231:8099/guosheng/community into Branch_liuzhen

@@ -497,7 +497,7 @@ class HouseAdmin extends Api
 
 
         Db::startTrans();
         Db::startTrans();
         $result = (new HouseAdminModel)->allowField(true)->save(array_merge([
         $result = (new HouseAdminModel)->allowField(true)->save(array_merge([
-            'user_id' => $admin_user['id']
+            'user_id' => $admin_user['id'],
             'avatar' => $admin_user['avatar'],
             'avatar' => $admin_user['avatar'],
             'is_direct' => 2
             'is_direct' => 2
         ],$post));
         ],$post));

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