fix

Helius

2022-08-10 907a259fc3ffa0ef51a3f87523785415a8f97208

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

@@ -51,6 +51,8 @@
        data.put("templatePath", templatePath);
        data.put("templateName", data.get("id"));
        globalData(data);

        log.info("========>{}", data.get("title"));
        if (StrUtil.isEmpty(templateName)) {
            templateName = "defualt.article.html";
        }
@@ -161,16 +163,15 @@
        if ("column".equals(type)){
            Long id = (Long) data.get("id");
            ColumnEntity columnEntity = columnMapper.selectById(id);
            data.put("title", columnEntity.getColumnName() + "_" + globalSetting.get("title"));
            globalSetting.put("title", columnEntity.getColumnName() + "_" + globalSetting.get("title"));
        } else if ("article".equals(type)) {
            Long id = (Long) data.get("id");
            ArticleEntity article = articleMapper.selectById(id);
            ColumnEntity columnEntity = columnMapper.selectById(article.getColumnId());
            data.put("title", article.getTitle() + "_" + columnEntity.getColumnName() +"_" + globalSetting.get("title"));
        } else {
            data.put("title", globalSetting.get("title"));
            globalSetting.put("title", article.getTitle() + "_" + columnEntity.getColumnName() +"_" + globalSetting.get("title"));
        }

        log.info("========>>>>{}", globalSetting.get("title"));
        data.putAll(globalSetting);
    }
}