|
@@ -9465,8 +9465,11 @@ class NewsService implements NewsServiceInterface
|
|
|
}
|
|
}
|
|
|
])
|
|
])
|
|
|
->leftJoin('user', 'user.id', '=', 'research_topic.user_id')
|
|
->leftJoin('user', 'user.id', '=', 'research_topic.user_id')
|
|
|
|
|
+ ->leftJoin('user_info', 'user_info.user_id', '=', 'research_topic.user_id')
|
|
|
->select('research_topic.id','research_topic.title','research_topic.updated_at','research_topic.status',
|
|
->select('research_topic.id','research_topic.title','research_topic.updated_at','research_topic.status',
|
|
|
- 'research_topic.due_time','user.nickname','research_topic.column_id','research_topic.user_id')
|
|
|
|
|
|
|
+ 'research_topic.due_time','user_info.real_name','research_topic.column_id','research_topic.user_id',
|
|
|
|
|
+ 'user.user_name'
|
|
|
|
|
+ )
|
|
|
->orderBy('research_topic.updated_at', 'desc')
|
|
->orderBy('research_topic.updated_at', 'desc')
|
|
|
->paginate($data['page_size'], ['*'], 'page', $data['page']);
|
|
->paginate($data['page_size'], ['*'], 'page', $data['page']);
|
|
|
if(empty($research_topic->items())){
|
|
if(empty($research_topic->items())){
|
|
@@ -9490,6 +9493,9 @@ class NewsService implements NewsServiceInterface
|
|
|
$result['rows'][$key]['is_update'] = 0;
|
|
$result['rows'][$key]['is_update'] = 0;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ if(!isset($value['real_name']) || empty($value['real_name'])){
|
|
|
|
|
+ $result['rows'][$key]['real_name'] = $value['user_name'];
|
|
|
|
|
+ }
|
|
|
if(!empty($value['retopicUsers'])){
|
|
if(!empty($value['retopicUsers'])){
|
|
|
$retopic_users = $value['retopicUsers'];
|
|
$retopic_users = $value['retopicUsers'];
|
|
|
$retopic_user = $retopic_users->pluck('user_id')->toArray();
|
|
$retopic_user = $retopic_users->pluck('user_id')->toArray();
|