From 92b7d27d595ccad08ea23b0b7a26a7d85f386a6d Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 10 Nov 2021 13:03:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=8E=A5=E5=8F=A3=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Article.php | 11 +++++++++--
 app/service/ArticleService.php |  6 +++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/api/controller/Article.php b/app/api/controller/Article.php
index 925f0f386..143cd380c 100644
--- a/app/api/controller/Article.php
+++ b/app/api/controller/Article.php
@@ -13,6 +13,7 @@ namespace app\api\controller;
 use app\service\ApiService;
 use app\service\SystemBaseService;
 use app\service\ArticleService;
+use app\service\ResourcesService;
 
 /**
  * 文章
@@ -130,10 +131,16 @@ class Article extends Common
                 // 访问统计
                 ArticleService::ArticleAccessCountInc(['id'=>$id]);
 
+                // 标签处理，兼容小程序rich-text
+                $data['data'][0]['content'] = ResourcesService::ApMiniRichTextContentHandle($data['data'][0]['content']);
+
+                // 上一篇、下一篇
+                $last_next_data = ArticleService::ArticleLastNextData($id);
+
                 // 返回数据
                 $result = [
-                    'data'          => $data['data'][0],
-                    'category_list' => $article_category['data'],
+                    'data'      => $data['data'][0],
+                    'last_next' => $last_next_data,
                 ];
                 $ret = SystemBaseService::DataReturn($result);
             } else {
diff --git a/app/service/ArticleService.php b/app/service/ArticleService.php
index ca901b3aa..b647c6df7 100755
--- a/app/service/ArticleService.php
+++ b/app/service/ArticleService.php
@@ -598,7 +598,7 @@ class ArticleService
         ];
         $last = self::DataHandle(Db::name('Article')->where($where)->field($field)->order('id desc')->limit(1)->select()->toArray());
 
-        // 上一条数据
+        // 下一条数据
         $where = [
             ['is_enable', '=', 1],
             ['id', '>', $article_id],
@@ -606,8 +606,8 @@ class ArticleService
         $next = self::DataHandle(Db::name('Article')->where($where)->field($field)->order('id asc')->limit(1)->select()->toArray());
 
         return [
-            'last'  => empty($last) ? [] : $last[0],
-            'next'  => empty($next) ? [] : $next[0],
+            'last'  => empty($last) ? null : $last[0],
+            'next'  => empty($next) ? null : $next[0],
         ];
     }
 }