Helius
2022-07-07 9327268d9580007afb8fc3fe5dd2841aee3832a7
Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
3 files modified
6 ■■■■■ changed files
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java 1 ●●●● patch | view | raw | blame | history
src/main/resources/mapper/ArticleMapper.xml 2 ●●● patch | view | raw | blame | history
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
@@ -155,6 +155,7 @@
        Long companyId = LoginUserUtil.getCompanyId();
        QueryWrapper<CmsTemplateEntity> objectQueryWrapper = new QueryWrapper<>();
        objectQueryWrapper.eq("company_id",companyId);
        objectQueryWrapper.eq("company_id",companyId);
        List<CmsTemplateEntity> cmsTemplateEntities = this.baseMapper.selectList(objectQueryWrapper);
        return Result.ok(cmsTemplateEntities);
    }
@@ -169,7 +170,7 @@
        String baseUrl = cmsProperties.getBaseUrl();
        String templatePath = cmsProperties.getTemplatePath();
        String htmlUrl = baseUrl + templatePath;
        String pathName = htmlUrl + "\\" + cmsTemplateEntity.getPath();
        String pathName = htmlUrl + "/" + cmsTemplateEntity.getPath();
        byte[] bytes = new byte[0];
        try {
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
@@ -424,6 +424,7 @@
        QueryWrapper<ArticleEntity> articleQueryWrapper = new QueryWrapper<>();
        articleQueryWrapper.eq("company_id",companyId);
        articleQueryWrapper.eq("del_status",ArticleEntity.DELETE_STATUS_NO);
        adminHomePageInfoVo.setArticleNum(articleMapper.selectCount(articleQueryWrapper));
        QueryWrapper<MessageBoardEntity> messageQueryWrapper = new QueryWrapper<>();
src/main/resources/mapper/ArticleMapper.xml
@@ -22,7 +22,7 @@
                    and a.title like concat ('%',#{record.title},'%')
                </if>
                <if test="record.columnIds != null">
                    and a.column_id =
                    and a.column_id in
                    <foreach collection="record.columnIds" separator="," close=")" open="(" item="item">
                        #{item}
                    </foreach>