From e703d415ff36584518a76d4d26363bfd1556b43b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 05 Jul 2022 12:01:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
index fe34c50..331ebe6 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/core/service/impl/CmsCoreServiceImpl.java
+++ b/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", 0L);
+ 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);
}
}
--
Gitblit v1.9.1