diff --git a/src/main/java/cn/celess/blog/mapper/ArticleTagMapper.java b/src/main/java/cn/celess/blog/mapper/ArticleTagMapper.java
index bcf4fc7..5620e8f 100644
--- a/src/main/java/cn/celess/blog/mapper/ArticleTagMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/ArticleTagMapper.java
@@ -1,6 +1,7 @@
 package cn.celess.blog.mapper;
 
 import cn.celess.blog.entity.ArticleTag;
+import cn.celess.blog.entity.Tag;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -27,6 +28,8 @@ public interface ArticleTagMapper {
 
     List<ArticleTag> findAllByArticleId(Long articleId);
 
+    List<Tag> findTagByArticleId(Long articleId);
+
     int deleteMultiById(List<ArticleTag> articleTags);
 
     List<ArticleTag> findArticleByTag(Long tagId);
diff --git a/src/main/resources/mapper/ArticleTagMapper.xml b/src/main/resources/mapper/ArticleTagMapper.xml
index 38f4ba6..bfd0c46 100644
--- a/src/main/resources/mapper/ArticleTagMapper.xml
+++ b/src/main/resources/mapper/ArticleTagMapper.xml
@@ -64,6 +64,14 @@
           and article_tag.t_id = tag_category.t_id
     </select>
 
+    <select id="findTagByArticleId" resultMap="cn.celess.blog.mapper.TagMapper.tagResultMap">
+        select tag_category.*
+        from article_tag,
+             tag_category
+        where a_id = #{articleId}
+          and article_tag.t_id = tag_category.t_id
+    </select>
+
     <select id="findOneById" resultMap="articleTagResultMap">
         select *
         from article_tag,
@@ -98,4 +106,4 @@
           and article_tag.a_id = article.a_id
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/articleMapper.xml b/src/main/resources/mapper/articleMapper.xml
index 6e9928d..2a3ee0d 100644
--- a/src/main/resources/mapper/articleMapper.xml
+++ b/src/main/resources/mapper/articleMapper.xml
@@ -1,185 +1,187 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.celess.blog.mapper.ArticleMapper">
-    <resultMap id="articleResultMap" type="cn.celess.blog.entity.Article">
-        <id column="a_id" property="id"/>
-        <result column="a_title" property="title"/>
-        <result column="a_summary" property="summary"/>
-        <result column="a_md_content" property="mdContent"/>
-        <result column="a_url" property="url"/>
-        <result column="a_author_id" property="user.id"/>
-        <result column="a_is_open" property="open"/>
-        <result column="a_is_original" property="type"/>
-        <!--        <result column="next_a_id" property="nextArticleId"/>-->
-        <!--        <result column="pre_a_id" property="preArticleId"/>-->
-        <result column="a_reading_number" property="readingNumber"/>
-        <result column="a_publish_date" property="publishDate"/>
-        <result column="a_update_date" property="updateDate"/>
-        <result column="is_delete" property="deleted"/>
-        <association property="category" column="a_category_id" javaType="cn.celess.blog.entity.TagCategory"
-                     resultMap="cn.celess.blog.mapper.CategoryMapper.categoryResultMap">
-        </association>
-        <collection property="tags" ofType="cn.celess.blog.entity.TagCategory"
-                    resultMap="cn.celess.blog.mapper.CategoryMapper.categoryResultMap">
-        </collection>
-    </resultMap>
-
-
-    <resultMap id="articleViewResultMap" type="cn.celess.blog.entity.Article">
-        <id column="articleId" property="id"/>
-        <result column="title" property="title"/>
-        <result column="summary" property="summary"/>
-        <result column="mdContent" property="mdContent"/>
-        <result column="url" property="url"/>
-        <result column="isOpen" property="open"/>
-        <result column="isOriginal" property="type"/>
-        <result column="likeCount" property="likeCount"/>
-        <result column="dislikeCount" property="dislikeCount"/>
-        <result column="readingCount" property="readingNumber"/>
-        <result column="publishDate" property="publishDate"/>
-        <result column="updateDate" property="updateDate"/>
-        <result column="isDelete" property="deleted"/>
-        <association property="category" column="categoryId" javaType="cn.celess.blog.entity.Category">
-            <id column="categoryId" property="id"/>
-            <result column="categoryName" property="name"/>
-        </association>
-        <association property="user" column="authorId" javaType="cn.celess.blog.entity.User">
-            <id column="authorId" property="id"/>
-            <result column="userEmail" property="email"/>
-            <result column="userAvatar" property="avatarImgUrl"/>
-            <result column="userDisplayName" property="displayName"/>
-        </association>
-        <collection property="tags" ofType="cn.celess.blog.entity.Tag">
-            <id column="tagId" property="id"/>
-            <result column="tagName" property="name"/>
-        </collection>
-
-    </resultMap>
-
-    <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="cn.celess.blog.entity.Article">
-        insert into article (a_author_id, a_category_id, a_md_content, a_is_original,
-                             a_summary, a_title, a_url)
-        values (#{user.id}, #{category.id}, #{mdContent}, #{type}, #{summary}, #{title}, #{url})
-    </insert>
-    <update id="delete">
-        update article
-        set is_delete = true
-        where a_id = #{id}
-    </update>
-
-    <update id="update">
-        update article
-        set a_update_date=now(),
-        <if test="title!=null">a_title=#{title},</if>
-        <if test="mdContent!=null">a_md_content=#{mdContent},</if>
-        <if test="summary!=null">a_summary=#{summary},</if>
-        <if test="type!=null">a_is_original=#{type},</if>
-        <if test="url!=null">a_url=#{url},</if>
-        <if test="category!=null">a_category_id=#{category.id},</if>
-        <if test="open!=null">a_is_open=#{open}</if>
-        where a_id = #{id}
-    </update>
-
-    <update id="updateReadingNumber">
-        update article
-        set a_reading_number=a_reading_number + 1
-        where a_id = #{id}
-    </update>
-
-    <select id="getLastestArticle" resultMap="articleViewResultMap" resultType="cn.celess.blog.entity.Article">
-        select *
-        from articleView
-        order by articleId desc
-        limit 1
-    </select>
-
-
-    <select id="findArticleById" resultMap="articleViewResultMap">
-        select *
-        from articleView
-        where articleId = #{id}
-    </select>
-
-    <select id="existsByTitle" resultType="boolean">
-        SELECT EXISTS(SELECT * FROM article WHERE a_title = #{title})
-    </select>
-
-    <select id="isDeletedById" resultType="boolean">
-        select is_delete
-        from article
-        WHERE a_id = #{id}
-    </select>
-
-    <select id="findAllByAuthorId" resultMap="articleViewResultMap">
-        select *
-        from articleView
-        where authorId = #{authorId}
-          and isDelete = false
-        order by articleId desc
-    </select>
-
-    <select id="findAllByOpen" resultMap="articleViewResultMap">
-        select *
-        from articleView
-        where isOpen = #{isOpen}
-          and isDelete = false
-        order by articleId desc
-    </select>
-
-
-    <select id="getTitleById" resultType="string">
-        SELECT title
-        from articleView
-        where articleId = #{id}
-    </select>
-
-    <select id="findAllByCategoryId" resultMap="articleViewResultMap">
-        select *
-        from articleView
-        where categoryId = #{id}
-          and isDelete = false
-        order by articleId desc
-    </select>
-
-    <select id="findAllByCategoryIdAndOpen" resultMap="articleViewResultMap">
-        select *
-        from articleView
-        where categoryId = #{id}
-          and isDelete = false
-          and isOpen = true
-        order by articleId desc
-    </select>
-
-
-    <select id="findAll" resultMap="articleViewResultMap">
-        select *
-        from articleView
-        order by articleId desc
-    </select>
-
-
-    <select id="count" resultType="long">
-        select count(*)
-        from article
-        where is_delete = false;
-    </select>
-
-    <select id="getPreArticle" resultMap="articleViewResultMap">
-        select *
-        from articleView
-        where articleId = (select max(articleId)
-                           from articleView
-                           where articleId &lt; #{id}
-        )
-    </select>
-    <select id="getNextArticle" resultMap="articleViewResultMap">
-        select *
-        from articleView
-        where articleId = (select min(articleId)
-                           from articleView
-                           where articleId &gt; #{id}
-        )
-    </select>
-
-
-</mapper>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.celess.blog.mapper.ArticleMapper">
+    <resultMap id="articleResultMap" type="cn.celess.blog.entity.Article">
+        <id column="a_id" property="id"/>
+        <result column="a_title" property="title"/>
+        <result column="a_summary" property="summary"/>
+        <result column="a_md_content" property="mdContent"/>
+        <result column="a_url" property="url"/>
+        <result column="a_author_id" property="user.id"/>
+        <result column="a_is_open" property="open"/>
+        <result column="a_is_original" property="type"/>
+        <!--        <result column="next_a_id" property="nextArticleId"/>-->
+        <!--        <result column="pre_a_id" property="preArticleId"/>-->
+        <result column="a_reading_number" property="readingNumber"/>
+        <result column="a_publish_date" property="publishDate"/>
+        <result column="a_update_date" property="updateDate"/>
+        <result column="is_delete" property="deleted"/>
+        <association property="category" column="a_category_id" javaType="cn.celess.blog.entity.TagCategory"
+                     resultMap="cn.celess.blog.mapper.CategoryMapper.categoryResultMap">
+        </association>
+        <collection property="tags" ofType="cn.celess.blog.entity.Tag"
+                    select="cn.celess.blog.mapper.ArticleTagMapper.findTagByArticleId" column="a_id">
+            <id column="tagId" property="id"/>
+            <result column="tagName" property="name"/>
+        </collection>
+    </resultMap>
+
+
+    <resultMap id="articleViewResultMap" type="cn.celess.blog.entity.Article">
+        <id column="articleId" property="id"/>
+        <result column="title" property="title"/>
+        <result column="summary" property="summary"/>
+        <result column="mdContent" property="mdContent"/>
+        <result column="url" property="url"/>
+        <result column="isOpen" property="open"/>
+        <result column="isOriginal" property="type"/>
+        <result column="likeCount" property="likeCount"/>
+        <result column="dislikeCount" property="dislikeCount"/>
+        <result column="readingCount" property="readingNumber"/>
+        <result column="publishDate" property="publishDate"/>
+        <result column="updateDate" property="updateDate"/>
+        <result column="isDelete" property="deleted"/>
+        <association property="category" column="categoryId" javaType="cn.celess.blog.entity.Category">
+            <id column="categoryId" property="id"/>
+            <result column="categoryName" property="name"/>
+        </association>
+        <association property="user" column="authorId" javaType="cn.celess.blog.entity.User">
+            <id column="authorId" property="id"/>
+            <result column="userEmail" property="email"/>
+            <result column="userAvatar" property="avatarImgUrl"/>
+            <result column="userDisplayName" property="displayName"/>
+        </association>
+        <collection property="tags" ofType="cn.celess.blog.entity.Tag">
+            <id column="tagId" property="id"/>
+            <result column="tagName" property="name"/>
+        </collection>
+
+    </resultMap>
+
+    <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="cn.celess.blog.entity.Article">
+        insert into article (a_author_id, a_category_id, a_md_content, a_is_original,
+                             a_summary, a_title, a_url)
+        values (#{user.id}, #{category.id}, #{mdContent}, #{type}, #{summary}, #{title}, #{url})
+    </insert>
+    <update id="delete">
+        update article
+        set is_delete = true
+        where a_id = #{id}
+    </update>
+
+    <update id="update">
+        update article
+        set a_update_date=now(),
+        <if test="title!=null">a_title=#{title},</if>
+        <if test="mdContent!=null">a_md_content=#{mdContent},</if>
+        <if test="summary!=null">a_summary=#{summary},</if>
+        <if test="type!=null">a_is_original=#{type},</if>
+        <if test="url!=null">a_url=#{url},</if>
+        <if test="category!=null">a_category_id=#{category.id},</if>
+        <if test="open!=null">a_is_open=#{open}</if>
+        where a_id = #{id}
+    </update>
+
+    <update id="updateReadingNumber">
+        update article
+        set a_reading_number=a_reading_number + 1
+        where a_id = #{id}
+    </update>
+
+    <select id="getLastestArticle" resultMap="articleViewResultMap" resultType="cn.celess.blog.entity.Article">
+        select *
+        from articleView
+        order by articleId desc
+        limit 1
+    </select>
+
+
+    <select id="findArticleById" resultMap="articleViewResultMap">
+        select *
+        from articleView
+        where articleId = #{id}
+    </select>
+
+    <select id="existsByTitle" resultType="boolean">
+        SELECT EXISTS(SELECT * FROM article WHERE a_title = #{title})
+    </select>
+
+    <select id="isDeletedById" resultType="boolean">
+        select is_delete
+        from article
+        WHERE a_id = #{id}
+    </select>
+
+    <select id="findAllByAuthorId" resultMap="articleViewResultMap">
+        select *
+        from articleView
+        where authorId = #{authorId}
+          and isDelete = false
+        order by articleId desc
+    </select>
+
+    <select id="findAllByOpen" resultMap="articleResultMap">
+        select *
+        from article
+        where a_is_open = #{isOpen}
+          and is_delete = false
+        order by a_id desc
+    </select>
+
+
+    <select id="getTitleById" resultType="string">
+        SELECT title
+        from articleView
+        where articleId = #{id}
+    </select>
+
+    <select id="findAllByCategoryId" resultMap="articleViewResultMap">
+        select *
+        from articleView
+        where categoryId = #{id}
+          and isDelete = false
+        order by articleId desc
+    </select>
+
+    <select id="findAllByCategoryIdAndOpen" resultMap="articleViewResultMap">
+        select *
+        from articleView
+        where categoryId = #{id}
+          and isDelete = false
+          and isOpen = true
+        order by articleId desc
+    </select>
+
+
+    <select id="findAll" resultMap="articleViewResultMap">
+        select *
+        from articleView
+        order by articleId desc
+    </select>
+
+
+    <select id="count" resultType="long">
+        select count(*)
+        from article
+        where is_delete = false;
+    </select>
+
+    <select id="getPreArticle" resultMap="articleViewResultMap">
+        select *
+        from articleView
+        where articleId = (select max(articleId)
+                           from articleView
+                           where articleId &lt; #{id}
+        )
+    </select>
+    <select id="getNextArticle" resultMap="articleViewResultMap">
+        select *
+        from articleView
+        where articleId = (select min(articleId)
+                           from articleView
+                           where articleId &gt; #{id}
+        )
+    </select>
+
+
+</mapper>
diff --git a/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java b/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java
index 6941f2d..457f760 100644
--- a/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java
+++ b/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java
@@ -134,4 +134,13 @@ public class ArticleTagMapperTest extends BaseTest {
 
         return articleTag;
     }
-}
\ No newline at end of file
+
+    @Test
+    public void findTagByArticleId() {
+        Article article = articleMapper.findAll().get(0);
+        assertNotNull(article);
+
+        List<Tag> tagByArticleId = articleTagMapper.findTagByArticleId(article.getId());
+        assertNotEquals(0, tagByArticleId.size());
+    }
+}
diff --git a/src/test/java/cn/celess/blog/service/ArticleServiceTest.java b/src/test/java/cn/celess/blog/service/ArticleServiceTest.java
index b32c223..b0ea6e5 100644
--- a/src/test/java/cn/celess/blog/service/ArticleServiceTest.java
+++ b/src/test/java/cn/celess/blog/service/ArticleServiceTest.java
@@ -3,6 +3,7 @@ package cn.celess.blog.service;
 import cn.celess.blog.BaseTest;
 import cn.celess.blog.entity.model.ArticleModel;
 import cn.celess.blog.entity.model.PageData;
+import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -24,4 +25,13 @@ public class ArticleServiceTest extends BaseTest {
         assertTrue(pageData.getList().stream().anyMatch(ArticleModel::isDeleted));
         assertTrue(pageData.getList().stream().anyMatch(articleModel -> !articleModel.isDeleted()));
     }
-}
\ No newline at end of file
+
+    @Test
+    public void retrievePageForOpen() {
+        PageData<ArticleModel> articleModelPageData = articleService.retrievePageForOpen(10, 1);
+        assertEquals(10, articleModelPageData.getPageSize());
+        assertEquals(1, articleModelPageData.getPageNum());
+        assertEquals(10, articleModelPageData.getList().size());
+        articleModelPageData.getList().forEach(Assert::assertNotNull);
+    }
+}