linwei
2024-01-10 90496048f4b8c65e42edf0e7998af4f235b7f222
文章bug修复
4 files modified
31 ■■■■ changed files
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml 4 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java 23 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/vo/ArticleVO.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -88,6 +88,8 @@
            ja.update_user,
            ja.create_user,
            ja.is_deleted,
            (select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id='1740566650527752194' and ja.article_type
            = bdb.dict_key) dictValue,
            jpd.id pdId
            from jczz_article ja
            LEFT JOIN jczz_public_discuss jpd on jpd.article_id=ja.id
@@ -462,7 +464,7 @@
        ja.create_user,
        ja.is_deleted,
        ja.article_range,
        ((select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id='1722966265111248897' and ja.article_type
        ((select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id=#{parentId} and ja.article_type
        = bdb.dict_key)) dictValue
        from jczz_article ja
        <where>
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.lettuce.core.dynamic.annotation.Param;
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.mapper.ArticleMapper;
import org.springblade.modules.article.service.ArticleService;
@@ -22,6 +21,7 @@
    /**
     * 查询资讯分页信息
     *
     * @param page
     * @param article 资讯对象
     * @return
@@ -33,6 +33,7 @@
    /**
     * 查询资讯分页信息
     *
     * @param page
     * @param article 资讯对象
     * @return
@@ -48,50 +49,53 @@
    @Override
    public IPage<Article> selectArticleG(IPage<Article> page, ArticleVO article) {
        return page.setRecords(baseMapper.selectArticleG(page,article));
        return page.setRecords(baseMapper.selectArticleG(page, article));
    }
    /**
     * 查询资讯分页信息(角色权限)
     *
     * @param page
     * @param article 资讯对象
     * @return
     */
    @Override
    public IPage<Article> pageDate(IPage<Article> page, ArticleVO article) {
        return page.setRecords(baseMapper.pageDate(page,article));
        return page.setRecords(baseMapper.pageDate(page, article));
    }
    /**
     * 查询资讯分页信息(敏感词预警)
     *
     * @param page
     * @param article 资讯对象
     * @return
     */
    @Override
    public IPage<Article> pageWords(IPage<Article> page, ArticleVO article) {
        return page.setRecords(baseMapper.pageWords(page,article));
        return page.setRecords(baseMapper.pageWords(page, article));
    }
    @Override
    public IPage<Article> pageCollectList(IPage<Article> page, ArticleVO article) {
        return page.setRecords(baseMapper.pageCollectList(page,article));
        return page.setRecords(baseMapper.pageCollectList(page, article));
    }
    /**
     * 查询资讯分页信息(角色权限)附带评论点赞数
     *
     * @param page
     * @param article 资讯对象
     * @return
     */
    @Override
    public IPage<Article> pageLikes(IPage<Article> page, ArticleVO article) {
        return page.setRecords(baseMapper.pageLikes(page,article));
        return page.setRecords(baseMapper.pageLikes(page, article));
    }
    @Override
    public IPage<Article> pageCollect(IPage<Article> page, ArticleVO article) {
        return page.setRecords(baseMapper.pageCollect(page,article));
        return page.setRecords(baseMapper.pageCollect(page, article));
    }
    /**
@@ -106,6 +110,11 @@
    @Override
    public ArticleVO getArticleOne(ArticleVO article) {
        if (article.getType() != null && article.getType().equals(4)) {
            article.setParentId("1740566650527752194");
        } else {
            article.setParentId("1722966265111248897");
        }
        ArticleVO articleVO = baseMapper.getArticleOne(article);
        return articleVO;
    }
src/main/java/org/springblade/modules/article/vo/ArticleVO.java
@@ -75,4 +75,6 @@
    private String districtId;
    private String parentId;
}
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -51,7 +51,7 @@
            <if test="userTopics.updateTime != null ">and jut.update_time = #{userTopics.updateTime}</if>
            <if test="userTopics.deleteFlag != null ">and jut.delete_flag = #{userTopics.deleteFlag}</if>
            <if test="userTopics.articleId != null ">and jut.article_id = #{userTopics.articleId}
                GROUP BY jut.article_id,
                GROUP BY jut.article_id, jut.signature_path,
                bu.avatar,
                bu.`name`,
                bu.phone,