修改

Helius

2022-11-12 067546725a07d08e0346ebf3a410d481e97e5730

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

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

        if (StrUtil.isEmpty(templateName)) {
            templateName = "defualt.article.html";
        }
@@ -161,14 +162,12 @@
        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"));
        }

        data.putAll(globalSetting);