Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-05 e703d415ff36584518a76d4d26363bfd1556b43b

 src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java

@@ -25,20 +25,19 @@
    public void articleProcess(Long id, String templateName) {
        Map<String, Object> data = new HashMap<>();
        data.put("id", id);

        data.put("companyId", 23L);
        if (StrUtil.isEmpty(templateName)) {
            templateName = "artile.defualt.html";
            templateName = "defualt.artile.html";
        }
        cfg.process(data, templateName);
    }

    @Override
    public void columnProcess(String code, String templateName, boolean article) {

    }

    @Override
    public void columnProcess(Long id, String templateName, boolean article) {

    public void columnProcess(Map<String, Object> data, String templateName, boolean article) {
        data.put("companyId", 23L);
        if (StrUtil.isEmpty(templateName)) {
            templateName = "defualt.list.html";
        }
        cfg.process(data, templateName);
    }
}