合并分支 'heshupeng' 到 'master'

bug修改



查看合并请求 !136

@@ -713,16 +713,14 @@ class HouseAdmin extends Api
         $msg->is_read_object = 1;
         $msg->is_read_object = 1;
         $msg->save();
         $msg->save();
 
 
-        $list = collection(HouseComment::where([
+        $list = HouseComment::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'])
             ])->order(['createtime'=>'desc'])
             ->page($page,$pageNum)
             ->page($page,$pageNum)
-            ->select())->toArray();
-        if(!empty($list)){
-            $list = array_multisort(array_column($list,'createtime'),SORT_ASC,$list);
-        }
+            ->select();
+        array_multisort(array_column($list,'createtime'),SORT_ASC,$list);
         // 管理员头像
         // 管理员头像
         $user = HouseAdminModel::where(['user_id'=>$this->auth->id,'house_id'=>$msg['object_id']])->field('id,nickname,avatar')->find();
         $user = HouseAdminModel::where(['user_id'=>$this->auth->id,'house_id'=>$msg['object_id']])->field('id,nickname,avatar')->find();
         $user['avatar'] = cdnurl($user['avatar'],true);
         $user['avatar'] = cdnurl($user['avatar'],true);

@@ -1151,7 +1151,7 @@ class Store extends Api
             $comment = $model->pageSelect($param['page'],$where_c,'*',$order,config('option.num'));
             $comment = $model->pageSelect($param['page'],$where_c,'*',$order,config('option.num'));
             $list = $comment->items();
             $list = $comment->items();
 //            $list = array_sort($list,'createtime',SORT_ASC);
 //            $list = array_sort($list,'createtime',SORT_ASC);
-            $list = array_multisort(array_column($list,'createtime'),SORT_ASC,$list);
+            array_multisort(array_column($list,'createtime'),SORT_ASC,$list);
             $user_model = new \app\api\model\User();
             $user_model = new \app\api\model\User();
             foreach ($list as &$v) {
             foreach ($list as &$v) {
                 if($v['type'] == 1) {
                 if($v['type'] == 1) {

@@ -498,9 +498,10 @@ class User extends Api
                     $object_user_id => $msg['object_user_id'],
                     $object_user_id => $msg['object_user_id'],
                 ]
                 ]
             ];
             ];
-            $order = ['createtime'=>'ASC'];
+            $order = ['createtime'=>'DESC'];
             $comment = $model->pageSelect($param['page'],$where_c,'*',$order,config('option.num'));
             $comment = $model->pageSelect($param['page'],$where_c,'*',$order,config('option.num'));
             $list = $comment->items();
             $list = $comment->items();
+            array_multisort(array_column($list,'createtime'),SORT_ASC,$list);
             $user_model = new \app\api\model\User();
             $user_model = new \app\api\model\User();
             foreach ($list as &$v) {
             foreach ($list as &$v) {
                 if($v['type'] == 1) {
                 if($v['type'] == 1) {