From 51ea662e22121f9a0ddb5b40c4a8e93e098b34ec Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Wed, 10 Jan 2024 22:22:44 +0800
Subject: [PATCH] fxi
---
src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 b50a231..f7af62a 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
@@ -28,14 +28,15 @@
private ColumnMapper columnMapper = SpringContextHolder.getBean(ColumnMapper.class);
private ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
- private CmsProperties cmsProperties = SpringContextHolder.getBean(CmsProperties.class);
+ private String baseUrl = "";
@Override
public void dataParser(AttrNode node) {
- log.info("导航栏解析");
+// log.info("导航栏解析");
Long companyId = (Long) node.getSystemDataValue("companyId");
+ baseUrl = (String) node.getSystemDataValue("baseUrl");
- List<ColumnEntity> columns = columnMapper.selectColumnByParentId(0L, companyId);
+ List<ColumnEntity> columns = columnMapper.selectColumnByParentId(0L, companyId, 1);
if (CollUtil.isEmpty(columns)) {
return;
@@ -45,14 +46,14 @@
NavData index = new NavData();
index.setTitle("首页");
- index.setUrl(cmsProperties.getBaseUrl());
+ index.setUrl(baseUrl);
index.setCode("index");
list.add(index);
for (ColumnEntity column : columns) {
NavData navData = columnToNav(column);
- List<ColumnEntity> child = columnMapper.selectColumnByParentId(column.getId(), companyId);
+ List<ColumnEntity> child = columnMapper.selectColumnByParentId(column.getId(), companyId, 1);
if (CollUtil.isNotEmpty(child)) {
List<NavData> childNavData = columnsToNavs(child);
navData.setChildren(childNavData);
@@ -75,14 +76,14 @@
public NavData columnToNav(ColumnEntity column) {
NavData navData = ColumnConversion.INSTANCE.columnToNav(column);
- navData.setUrl(cmsProperties.getBaseUrl() + column.getPath());
+ navData.setUrl(baseUrl + column.getPath());
if (column.getType() == 2) {
if (column.getTargetType() == 1) {
ArticleEntity article = this.articleMapper.selectArticleById(Long.parseLong(column.getTargetUrl()));
- navData.setUrl(cmsProperties.getBaseUrl() + article.getPath() + "/" + article.getId() + ".html");
+ navData.setUrl(baseUrl + article.getPath() + "/" + article.getId() + ".html");
} else if (column.getTargetType() == 2) {
ColumnEntity columnEntity = this.columnMapper.selectByCodeAndCompanyId(column.getTargetUrl(), column.getCompanyId());
- navData.setUrl(cmsProperties.getBaseUrl() + columnEntity.getPath());
+ navData.setUrl(baseUrl + columnEntity.getPath());
} else {
navData.setUrl(column.getTargetUrl());
}
--
Gitblit v1.9.1