| xqd
@@ -85,7 +85,7 @@ class NoticeService
|
|
|
->leftJoin('users','dynamic_zan.user_id','=','users.id')
|
|
|
->leftJoin('users_info','dynamic_zan.user_id','=','users_info.user_id')
|
|
|
->where('dynamic.user_id',$param['user_id'])
|
|
|
- ->select(['dynamic_zan.id','dynamic.user_id','dynamic.atime','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
|
|
|
+ ->select(['dynamic_zan.id','dynamic_zan.atime','dynamic_zan.user_id','dynamic.content','dynamic.img_url','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
|
|
|
|
|
|
//清除他赞了我未读状态
|
|
|
DynamicZanModel::query()->with(['dynamic'])->where('status','=',0)->whereHas('dynamic',function ($query)use($param){
|
| xqd
@@ -108,7 +108,7 @@ class NoticeService
|
|
|
->leftJoin('users','dynamic.user_id','=','users.id')
|
|
|
->leftJoin('users_info','dynamic.user_id','=','users_info.user_id')
|
|
|
->where('dynamic_zan.user_id',$param['user_id'])
|
|
|
- ->select(['dynamic_zan.id','dynamic.user_id','dynamic.atime','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
|
|
|
+ ->select(['dynamic_zan.id','dynamic_zan.atime','dynamic.user_id','dynamic.content','dynamic.img_url','users.sex','users.is_vip','users.tencent_im_user_id','users_info.nickname','users_info.avatar','users_info.birthday','users_info.work','users_info.height','users_info.weight']);
|
|
|
}
|
|
|
$query = $query->orderByDesc('id')
|
|
|
->paginate(request('perPage',20));
|