diff --git a/app/data/controller/NewsItem.php b/app/data/controller/NewsItem.php index f173a2464..433943b8e 100644 --- a/app/data/controller/NewsItem.php +++ b/app/data/controller/NewsItem.php @@ -55,7 +55,7 @@ class NewsItem extends Controller */ protected function _page_filter(array &$data) { - NewsService::instance()->buildListState($data); + NewsService::instance()->buildData($data); } /** diff --git a/app/data/controller/api/News.php b/app/data/controller/api/News.php index 89a5108ea..689a5ea7f 100644 --- a/app/data/controller/api/News.php +++ b/app/data/controller/api/News.php @@ -44,7 +44,7 @@ class News extends Controller $query = $this->_query('DataNewsItem')->like('name,mark')->equal('id,code'); $query->where(['deleted' => 0, 'status' => 1])->withoutField('sort,status,deleted'); $result = $query->order('sort desc,id desc')->page(true, false, false, 15); - NewsService::instance()->buildListState($result['list'], input('uid', 0)); + NewsService::instance()->buildData($result['list'], input('uid', 0)); $this->success('获取文章内容', $result); } diff --git a/app/data/service/NewsService.php b/app/data/service/NewsService.php index ed5358dcf..069a742ef 100644 --- a/app/data/service/NewsService.php +++ b/app/data/service/NewsService.php @@ -56,13 +56,13 @@ class NewsService extends Service * @param integer $uid 用户UID * @return array */ - public function buildListState(array &$list, int $uid = 0): array + public function buildData(array &$list, int $uid = 0): array { if (count($list) > 0) { - [$code2, $code1, $marks] = [[], [], []]; + [$code2, $code1] = [[], []]; + $marks = $this->app->db->name('DataNewsMark')->where(['status' => 1])->column('name'); if ($uid > 0) { $map = [['uid', '=', $uid], ['code', 'in', array_unique(array_column($list, 'code'))]]; - $marks = $this->app->db->name('DataNewsMark')->where(['status' => 1])->column('name'); $code1 = $this->app->db->name('DataNewsXCollect')->where($map)->where(['type' => 1])->column('code'); $code2 = $this->app->db->name('DataNewsXCollect')->where($map)->where(['type' => 2])->column('code'); } diff --git a/app/data/view/news_item/index.html b/app/data/view/news_item/index.html index 66d0dbfba..8894e41a3 100644 --- a/app/data/view/news_item/index.html +++ b/app/data/view/news_item/index.html @@ -47,7 +47,7 @@