20220606

xiaoyong931011

2022-07-07 9173e48b6f15bd6f52f5eda8c46c0f8fa6976971

20220606

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java

@@ -154,6 +154,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);
    }
@@ -168,7 +169,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/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>