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

@@ -245,11 +245,13 @@ class HouseAdmin extends Api
         $pageNum = $this->request->param('pageNum', 10, 'intval');
         $pageNum = $this->request->param('pageNum', 10, 'intval');
         $house_id = $this->request->param('house_id');
         $house_id = $this->request->param('house_id');
         empty($house_id) && $this->error('社区id不能为空');
         empty($house_id) && $this->error('社区id不能为空');
-        $data['total_num'] = Db::name('house_board')
-            ->where('house_id',$house_id)
+        $where = ['hb.house_id'=>$house_id];
+        $total_num = HouseBoard::where($where)
+            ->alias('hb')
+            ->join('house_admin ha','ha.id = hb.admin_user_id')
             ->count();
             ->count();
-        $data['info'] = $this->getBoardList(['hb.house_id'=>$house_id],$page,$pageNum);
-        $this->success('success',$data);
+        $list = $this->getBoardList($where,$page,$pageNum);
+        $this->success('success',compact('total_num','list'));
     }
     }
 
 
     /**
     /**
@@ -558,6 +560,10 @@ class HouseAdmin extends Api
         if(!empty($keyword)){
         if(!empty($keyword)){
             $where['uh.name|uh.remark'] = ['like','%'.$keyword.'%'];
             $where['uh.name|uh.remark'] = ['like','%'.$keyword.'%'];
         }
         }
+        $total_num = UserHouse::alias('uh')
+            ->join('user u','u.id = uh.user_id')
+            ->where($where)
+            ->count();
         $list = UserHouse::alias('uh')
         $list = UserHouse::alias('uh')
             ->join('user u','u.id = uh.user_id')
             ->join('user u','u.id = uh.user_id')
             ->where($where)
             ->where($where)
@@ -568,7 +574,7 @@ class HouseAdmin extends Api
         foreach($list as &$v){
         foreach($list as &$v){
             $v['avatar'] = cdnurl($v['avatar']);
             $v['avatar'] = cdnurl($v['avatar']);
         }
         }
-        $this->success('success',['total_num'=>count($list),'list'=>$list]);
+        $this->success('success',compact('total_num','list'));
     }
     }
 
 
     /**
     /**
@@ -649,8 +655,12 @@ class HouseAdmin extends Api
         $pageNum = $this->request->param('pageNum', 10, 'intval');
         $pageNum = $this->request->param('pageNum', 10, 'intval');
         $house_id = $this->request->param('house_id');
         $house_id = $this->request->param('house_id');
         empty($house_id) && $this->error('缺少必要参数');
         empty($house_id) && $this->error('缺少必要参数');
+        $where = ['object_user_id'=>$this->auth->id];
+        $total_num = Message::where('object_id',$house_id)
+            ->where($where)
+            ->count();
         $list = Message::where('object_id',$house_id)
         $list = Message::where('object_id',$house_id)
-            ->where('object_user_id',$this->auth->id)
+            ->where($where)
             ->page($page,$pageNum)
             ->page($page,$pageNum)
             ->order('createtime desc')
             ->order('createtime desc')
             ->select();
             ->select();
@@ -663,7 +673,7 @@ class HouseAdmin extends Api
                 $v['name'] = Db::name('user')->where('id',$v['user_id'])->value('nickname');
                 $v['name'] = Db::name('user')->where('id',$v['user_id'])->value('nickname');
             }
             }
         }
         }
-        $this->success('success',['total_num'=>count($list),'list'=>$list]);
+        $this->success('success',compact('total_num','list'));
     }
     }
 
 
     /**
     /**
@@ -712,12 +722,13 @@ class HouseAdmin extends Api
 
 
         $msg->is_read_object = 1;
         $msg->is_read_object = 1;
         $msg->save();
         $msg->save();
-
-        $list = HouseComment::where([
+        $where = [
             'user_id' => $msg['user_id'],
             'user_id' => $msg['user_id'],
             'house_id' => $msg['object_id'],
             'house_id' => $msg['object_id'],
             'house_user_id' => $msg['object_user_id'],
             'house_user_id' => $msg['object_user_id'],
-            ])->order(['createtime'=>'desc'])
+        ];
+        $total_num = HouseComment::where($where)->count();
+        $list = HouseComment::where($where)->order(['createtime'=>'desc'])
             ->page($page,$pageNum)
             ->page($page,$pageNum)
             ->select();
             ->select();
         array_multisort(array_column($list,'createtime'),SORT_ASC,$list);
         array_multisort(array_column($list,'createtime'),SORT_ASC,$list);
@@ -733,7 +744,7 @@ class HouseAdmin extends Api
             }
             }
             $v['user'] = $user;
             $v['user'] = $user;
         }
         }
-        $this->success('success',['total_num'=>count($list),'list'=>$list]);
+        $this->success('success',compact('total_num','list'));
     }
     }
 
 
     /**
     /**

@@ -691,6 +691,8 @@ class User extends Api
      * @ApiRoute    (/api/user/moneyLog)
      * @ApiRoute    (/api/user/moneyLog)
      *
      *
      * @ApiHeaders  (name=token, type=string, required=true, description="请求的Token")
      * @ApiHeaders  (name=token, type=string, required=true, description="请求的Token")
+     * @ApiParams   (name="page", type="inter", required=false, description="当前页(默认1)")
+     * @ApiParams   (name="pageNum", type="inter", required=false, description="每页显示数据个数（默认10）")
      *
      *
      * @ApiReturn({
      * @ApiReturn({
 		"code": 1,
 		"code": 1,
@@ -705,10 +707,15 @@ class User extends Api
      */
      */
     public function moneyLog()
     public function moneyLog()
     {
     {
-        $list = UserMoneyLog::where('user_id',$this->auth->id)
+        $page = $this->request->param('page', 1, 'intval');
+        $pageNum = $this->request->param('pageNum', 10, 'intval');
+        $where = ['user_id'=>$this->auth->id];
+        $total_num = UserMoneyLog::where($where)->count();
+        $list = UserMoneyLog::where($where)
         	->field("memo,money,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime")
         	->field("memo,money,from_unixtime(createtime, '%Y-%m-%d %H:%i:%S') createtime")
+            ->page($page,$pageNum)
         	->select();
         	->select();
-        $this->success('成功',$list);
+        $this->success('成功',compact('total_num','list'));
     }
     }
 
 
     /**
     /**