|
|
@@ -110,6 +110,7 @@ class UserDynamicComment extends UserDynamicCommentModel
|
|
|
$list = parent::alias($this->name)
|
|
|
->leftJoin('user_dynamic d','d.id='.$this->name.'.dynamic_id')
|
|
|
->leftJoin('user u','u.user_id='.'d.user_id')
|
|
|
+ ->leftJoin('user cu','cu.user_id='.$this->name.'.user_id')
|
|
|
->where([$this->name.'.status'=>1,'d.user_id'=> $userId,'d.status'=>1])
|
|
|
->where(function($query) use($param){
|
|
|
// 关键词
|
|
|
@@ -117,7 +118,7 @@ class UserDynamicComment extends UserDynamicCommentModel
|
|
|
$query->where('content','like', "%{$param['keyword']}%");
|
|
|
}
|
|
|
})
|
|
|
- ->field('d.id as dynamic_id,d.image,d.content,d.user_id,u.nick_name,u.avatar_id,'.$this->name.'.create_time,'.$this->name.'.content as comment')
|
|
|
+ ->field('d.id as dynamic_id,d.image,d.content,d.user_id,u.nick_name,u.avatar_id,'.$this->name.'.create_time,'.$this->name.'.content as comment,cu.nick_name as comment_user_nickname')
|
|
|
->group($this->name.'.dynamic_id')
|
|
|
->order($this->name.'.create_time desc, d.id desc')
|
|
|
->paginate($listRows);
|