From 10c3e4c912933a0c020147ba185b196c8e4a9183 Mon Sep 17 00:00:00 2001
From: sunxin <2741094504@qq.com>
Date: Tue, 5 Mar 2019 10:21:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/mingsoft/cms/dao/IArticleDao.xml     | 2 +-
 src/main/java/net/mingsoft/cms/util/CmsParserUtil.java | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/mingsoft/cms/dao/IArticleDao.xml b/src/main/java/net/mingsoft/cms/dao/IArticleDao.xml
index b3413b7c..21e3961a 100644
--- a/src/main/java/net/mingsoft/cms/dao/IArticleDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IArticleDao.xml
@@ -320,7 +320,7 @@
 	<!-- 根据站点编号、开始、结束时间和栏目编号查询文章编号集合 -->
 	<select id="queryIdsByCategoryIdForParser" resultMap="resultMapBean" >
 		select
-		ARTICLE_BASICID,cl.*
+		ARTICLE_BASICID,cl.*,c.*
 		FROM cms_article a LEFT JOIN basic b  ON a.ARTICLE_BASICID = b.BASIC_ID 
 		LEFT JOIN basic_column cl ON b.BASIC_CATEGORYID = cl.COLUMN_CATEGORY_ID 
 		JOIN category c ON c.CATEGORY_ID = cl.COLUMN_CATEGORY_ID
diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
index fe044a4d..a84602c8 100644
--- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
+++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
@@ -213,14 +213,16 @@ public class CmsParserUtil extends ParserUtil {
 			// 第一篇文章没有上一篇
 			if (ai > 0) {
 				ColumnArticleIdBean preCaBean = articleIdList.get(ai - 1);
-				if(articleIdList.get(ai).getColumnPath().contains(preCaBean.getCategoryId()+"")){
+				//判断当前文档是否与上一页文档在同一栏目下，并且不能使用父栏目字符串，因为父栏目中没有所属栏目编号
+				if(articleColumnPath.contains(preCaBean.getCategoryId()+"")){
 					parserParams.put(PRE_ID, preCaBean.getArticleId());
 				}
 			}
 			// 最后一篇文章没有下一篇
 			if (ai + 1 < articleIdList.size()) {
 				ColumnArticleIdBean nextCaBean = articleIdList.get(ai + 1);
-				if(articleIdList.get(ai).getColumnPath().contains(nextCaBean.getCategoryId()+"")){
+				//判断当前文档是否与上一页文档在同一栏目下并且不能使用父栏目字符串，因为父栏目中没有所属栏目编号
+				if(articleColumnPath.contains(nextCaBean.getCategoryId()+"")){
 					parserParams.put(NEXT_ID, nextCaBean.getArticleId());
 				}
 			}