🐛 Fixing a bug.

blog-core/src/main/java/com/zyd/blog/business/service/impl/BizArticleServiceImpl.java

@@ -89,9 +89,9 @@ public class BizArticleServiceImpl implements BizArticleService {
             BizArticle tagArticle = tagMap.get(bizArticle.getId());
             if (null == tagArticle) {
                 log.warn("文章[{}] 未绑定标签信息，或者已绑定的标签不存在！", bizArticle.getTitle());
-                continue;
+            } else {
+                bizArticle.setTags(tagArticle.getTags());
             }
-            bizArticle.setTags(tagArticle.getTags());
             this.subquery(bizArticle);
             boList.add(new Article(bizArticle));
         }

blog-core/src/main/resources/mybatis/BizArticleMapper.xml

@@ -158,7 +158,7 @@
 			biz_article a
 		INNER JOIN biz_type btype ON a.type_id = btype.id
 		INNER JOIN biz_article_tags atag ON a.id = atag.article_id
-		INNER JOIN biz_tags t ON atag.tag_id = t.id
+		LEFT JOIN biz_tags t ON atag.tag_id = t.id
 		WHERE
 			a.id = #{id}
 	</select>

blog-web/src/main/java/com/zyd/blog/controller/RenderController.java

@@ -186,7 +186,7 @@ public class RenderController {
     public ModelAndView article(Model model, @PathVariable("articleId") Long articleId) {
         Article article = bizArticleService.getByPrimaryKey(articleId);
         if (article == null || ArticleStatusEnum.UNPUBLISHED.getCode() == article.getStatusEnum().getCode()) {
-            return ResultUtil.redirect("/error/404");
+            return ResultUtil.forward("/error/404");
         }
         model.addAttribute("article", article);
         // 上一篇下一篇

blog-web/src/main/resources/static/css/zhyd.core.css

@@ -315,9 +315,10 @@ blockquote {
 .blog-info-body p {
     text-indent: 0;
     line-height: 1.5;
-    margin: .8em 0 !important;
-    color: #1c1f21;
+    color: rgb(28, 31, 33);
     overflow-x: auto;
+    margin: 0.8em 0 !important;
+    padding: 10px 0;
 }
 
 .blog-info-body table {

blog-web/src/main/resources/templates/article.ftl

@@ -74,9 +74,13 @@
                     <ul class="list-unstyled">
                         <li>
                             <strong>本文标签：</strong>
-                                <#list article.tags as item>
-                                    <a href="${config.siteUrl}/tag/${item.id?c}" class="c-label" data-original-title="${item.name}" data-toggle="tooltip" data-placement="bottom" target="_blank">${item.name}</a>
-                                </#list>
+                                <#if article.tags?? && article.tags?size gt 0>
+                                    <#list article.tags as item>
+                                        <a href="${config.siteUrl}/tag/${item.id?c}" class="c-label" data-original-title="${item.name}" data-toggle="tooltip" data-placement="bottom" target="_blank">${item.name}</a>
+                                    </#list>
+                                <#else>
+                                    <a href="javascript:;;" class="c-label" data-original-title="暂无相关标签" data-toggle="tooltip" data-placement="bottom" target="_blank">暂无相关标签</a>
+                                </#if>
                         </li>
                         <li>
                             <strong>版权声明：</strong>