修复bug
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
package cn.celess.blog.enmu;
|
||||
|
||||
import com.sun.javaws.jnl.IconDesc;
|
||||
|
||||
/**
|
||||
* @Author: 小海
|
||||
* @Date: 2020-05-25 08:58
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package cn.celess.blog.entity;
|
||||
|
||||
import com.sun.xml.internal.ws.policy.EffectiveAlternativeSelector;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@@ -281,7 +281,8 @@ public class ArticleServiceImpl implements ArticleService {
|
||||
PageData<ArticleModel> pageData = new PageData<ArticleModel>(new PageInfo<Article>(articleList));
|
||||
List<ArticleModel> articleModelList = new ArrayList<>();
|
||||
articleList.forEach(article -> {
|
||||
ArticleModel articleModel = ModalTrans.article(article, true);
|
||||
ArticleModel articleModel = ModalTrans.article(article);
|
||||
articleModel.setMdContent(null);
|
||||
articleModelList.add(articleModel);
|
||||
});
|
||||
pageData.setList(articleModelList);
|
||||
|
||||
@@ -28,7 +28,7 @@ public class ModalTrans {
|
||||
|
||||
public static ArticleModel article(Article article, boolean noMdContent) {
|
||||
ArticleModel article1 = article(article);
|
||||
if (!noMdContent) {
|
||||
if (!noMdContent || article1 == null) {
|
||||
return article1;
|
||||
}
|
||||
article1.setMdContent(null);
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
t_id = #{tag.id},
|
||||
</if>
|
||||
</set>
|
||||
where at_id = #{tag.id}
|
||||
where at_id = #{id}
|
||||
</update>
|
||||
|
||||
<!--通过主键删除-->
|
||||
@@ -69,7 +69,8 @@
|
||||
from article_tag,
|
||||
article,
|
||||
tag_category
|
||||
where article_tag.a_id = article.a_id
|
||||
where article_tag.at_id = #{id}
|
||||
and article_tag.a_id = article.a_id
|
||||
and tag_category.t_id = article_tag.t_id
|
||||
</select>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user