|
@@ -469,13 +469,16 @@ class NewsService implements NewsServiceInterface
|
|
|
{
|
|
|
$where = [
|
|
|
'article.id' => $data['id'],
|
|
|
- 'article.status' => 1,
|
|
|
+ // 'article.status' => 1,
|
|
|
];
|
|
|
$result = Article::where($where)->leftJoin("article_data", "article.id", "article_data.article_id")->first();
|
|
|
- $articleSurvey = ArticleSurvey::where(['art_id' => $data['id']])->get();
|
|
|
- $result['survey_array'] = $articleSurvey->toArray();
|
|
|
+ $articleSurvey = ArticleSurvey::where(['art_id' => $data['id']])->get()->all();
|
|
|
+ var_dump($articleSurvey, 'articleSurvey');
|
|
|
+ $info = $result;
|
|
|
+ var_dump($info, 'info');
|
|
|
+ // $info['survey_array'] = $articleSurvey == null ? [] : $info['survey_array'];
|
|
|
if ($result) {
|
|
|
- return Result::success($result->toArray());
|
|
|
+ return Result::success($info);
|
|
|
} else {
|
|
|
return Result::error("查询失败", 0);
|
|
|
}
|