From 3a8d8b6de6daf6e7198a2b8d562dc2fbf49a4a2a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jul 2022 11:47:45 +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 | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 7a2eb81..21dd11e 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
@@ -112,6 +112,15 @@
public void process(Map<String, Object> data, String templateType, String templateName) {
data.put("templateType", templateType);
globalData(data);
+
+ if ("search".equals(templateType) && StrUtil.isBlank(templateName)) {
+ templateName = "search.html";
+ }
+
+ if ("message".equals(templateType) && StrUtil.isBlank(templateName)) {
+ templateName = "message.html";
+ }
+
try {
cfg.process(data, templateName);
} catch (Exception e) {
--
Gitblit v1.9.1