合并分支 'heshupeng' 到 'master'

bug修改



查看合并请求 !99

@@ -19,6 +19,8 @@ use app\api\model\HouseBoard;
 use app\api\model\UserHouse;
 use app\api\model\HousePhone;
 use app\api\model\Message;
+use app\api\model\StoreComment;
+use app\api\model\HouseComment;
 
  /**
  * 社区管理员
@@ -56,18 +58,19 @@ class HouseAdmin extends Api
         $user_id = $this->auth->id;
         $house_id = $this->request->param('house_id');
         if($house_id){
-            $info = HouseAdminModel::get(['user_id'=>$user_id,'house_id'=>$house_id]);
+            $info = HouseAdminModel::get(['user_id'=>$user_id,'house_id'=>$house_id],['house']);
             empty($info) && $this->error('您不是该小区的管理员');
-            $info->visible(['id','house_id','is_direct','nickname','avatar'])->toArray();
+            $info->visible(['id','house_id','is_direct','nickname','avatar','house'])->toArray();
         }else{
-            $info = HouseAdminModel::where(['user_id'=>$user_id])
+            $info = HouseAdminModel::with(['house'])
+            	->where(['user_id'=>$user_id])
                 ->order(['is_direct'=>'asc','createtime'=>'asc'])
                 ->field('id,house_id,is_direct,nickname,avatar')
                 ->find();
             empty($info) && $this->error('您还不是管理员');
         }
         $info['avatar'] = cdnurl($info['avatar'],true);
-        $info['house'] = House::where('id',$info['house_id'])->field('id,name')->find();
+        $info->getRelation('house')->visible(['id','name']);
         $this->success('success',$info);
     }
 
@@ -714,8 +717,8 @@ class HouseAdmin extends Api
             $object_user_id = 'store_user_id';
         } elseif($info['type'] == 3) {
             $model = new HouseComment();
-            $object_model = new \app\api\model\User();
-            $object_field = 'id,admin_nickname as nickname,admin_avatar as avatar';
+            $object_model = new \app\api\model\HouseAdmin();
+            $object_field = 'id,nickname,avatar';
             $object_id = 'house_id';
             $object_user_id = 'house_user_id';
         } else {
@@ -725,7 +728,7 @@ class HouseAdmin extends Api
                 'user_id' => $info['user_id'],
                 $object_id => $info['object_id'],
                 $object_user_id => $info['object_user_id'],
-            ])->order(['createtime'=>'desc'])
+            ])->order(['createtime'=>'asc'])
             ->page($page,$pageNum)
             ->select();
         $user_model = new \app\api\model\User();
@@ -734,7 +737,7 @@ class HouseAdmin extends Api
                 $user = $user_model->field('id,nickname,avatar')->where('id',$v['user_id'])->find();
                 $user['avatar'] = cdnurl($user['avatar']);
             } else {
-                $user = $object_model->field($object_field)->where('id',$v[$object_user_id])->find();
+                $user = $object_model->field($object_field)->where(['house_id'=>$v['house_id'],'user_id'=>$v['house_user_id']])->find();
                 $user['avatar'] = cdnurl($user['avatar']);
             }
             $v['user'] = $user;