From 008f79857609c0217a798848a95a4139b73d884e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 16:05:45 +0800
Subject: [PATCH] fix:文章列表解析

---
 src/main/java/com/xcong/farmer/cms/core/handler/NavDataParserHandler.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 48ed2c0..ab64db2 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
@@ -27,7 +27,7 @@
 
     private ColumnMapper columnMapper = SpringContextHolder.getBean(ColumnMapper.class);
     private ArticleMapper articleMapper = SpringContextHolder.getBean(ArticleMapper.class);
-    private String BASE_URL = "http://192.168.0.1/";
+    private String BASE_URL = "http://192.168.0.1";
     @Override
     public void dataParser(AttrNode node) {
         log.info("导航栏解析");
@@ -40,6 +40,13 @@
         }
 
         List<NavData> list = new ArrayList<>();
+
+        NavData index = new NavData();
+        index.setTitle("首页");
+        index.setUrl(BASE_URL);
+        index.setCode("index");
+        list.add(index);
+
         for (ColumnEntity column : columns) {
             NavData navData = columnToNav(column);
 
@@ -50,6 +57,7 @@
             }
             list.add(navData);
         }
+
         node.setData(list);
     }
 
@@ -65,13 +73,14 @@
     public NavData columnToNav(ColumnEntity column) {
         NavData navData = ColumnConversion.INSTANCE.columnToNav(column);
 
-        navData.setUrl(BASE_URL + navData.getCode());
+        navData.setUrl(BASE_URL + column.getPath());
         if (column.getType() == 2) {
             if (column.getTargetType() == 1) {
                 ArticleEntity article = this.articleMapper.selectArticleById(Long.parseLong(column.getTargetUrl()));
-                navData.setUrl(BASE_URL + article.getColumnCode() + "/" + article.getId() + ".html");
+                navData.setUrl(BASE_URL + article.getPath() + "/" + article.getId() + ".html");
             } else if (column.getTargetType() == 2) {
-                navData.setUrl(BASE_URL + column.getTargetUrl());
+                ColumnEntity columnEntity = this.columnMapper.selectByCodeAndCompanyId(column.getTargetUrl(), column.getCompanyId());
+                navData.setUrl(BASE_URL + columnEntity.getPath());
             } else {
                 navData.setUrl(column.getTargetUrl());
             }

--
Gitblit v1.9.1