From 69830f1a3b084ad6800c8013268624a11d7fa5f3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 11 Jan 2024 09:56:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cms' into anentang
---
src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java
index 908843c..a4e63b5 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java
@@ -1,14 +1,17 @@
package com.xcong.farmer.cms.core.handler;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.xcong.farmer.cms.configurations.properties.CmsProperties;
import com.xcong.farmer.cms.conversion.ColumnConversion;
import com.xcong.farmer.cms.core.node.AttrNode;
import com.xcong.farmer.cms.core.tag.data.NavData;
import com.xcong.farmer.cms.core.tag.model.Nav;
import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
+import com.xcong.farmer.cms.modules.system.entity.CmsTemplateEntity;
import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
import com.xcong.farmer.cms.modules.system.mapper.ArticleMapper;
+import com.xcong.farmer.cms.modules.system.mapper.CmsTemplateMapper;
import com.xcong.farmer.cms.modules.system.mapper.ColumnMapper;
import com.xcong.farmer.cms.modules.system.vo.AdminColumnVo;
import com.xcong.farmer.cms.utils.SpringContextHolder;
@@ -28,6 +31,7 @@
private ColumnMapper columnMapper = SpringContextHolder.getBean(ColumnMapper.class);
private ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
+ private CmsTemplateMapper cmsTemplateMapper = SpringContextHolder.getBean(CmsTemplateMapper.class);
private String baseUrl = "";
@Override
@@ -45,9 +49,13 @@
List<NavData> list = new ArrayList<>();
NavData index = new NavData();
-// index.setTitle("首页");
-
- index.setTitle("Main");
+ //首页是否设置，设置了从内容模版表中取名称
+ CmsTemplateEntity cmsTemplateEntity = cmsTemplateMapper.selectByPathAndCompanyId("index.html", companyId);
+ if(ObjectUtil.isNotEmpty(cmsTemplateEntity)){
+ index.setTitle(cmsTemplateEntity.getName());
+ }else{
+ index.setTitle("首页");
+ }
index.setUrl(baseUrl);
index.setCode("index");
list.add(index);
--
Gitblit v1.9.1