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/ColumnDataParserHandler.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java b/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java
index db0ebb5..7a742e7 100644
--- a/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java
+++ b/src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java
@@ -25,7 +25,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 attrNode) {
@@ -55,13 +55,14 @@
     public ColumnData columnToData(ColumnEntity column) {
         ColumnData columnData = ColumnConversion.INSTANCE.entityToData(column);
 
-        columnData.setUrl(BASE_URL + columnData.getCode());
+        columnData.setUrl(BASE_URL + column.getPath());
         if (column.getType() == 2) {
             if (column.getTargetType() == 1) {
                 ArticleEntity article = this.articleMapper.selectArticleById(Long.parseLong(column.getTargetUrl()));
-                columnData.setUrl(BASE_URL + article.getColumnCode() + "/" + article.getId() + ".html");
+                columnData.setUrl(BASE_URL + article.getPath() + "/" + article.getId() + ".html");
             } else if (column.getTargetType() == 2) {
-                columnData.setUrl(BASE_URL + column.getTargetUrl());
+                ColumnEntity columnEntity = this.columnMapper.selectByCodeAndCompanyId(column.getTargetUrl(), column.getCompanyId());
+                columnData.setUrl(BASE_URL + columnEntity.getPath());
             } else {
                 columnData.setUrl(column.getTargetUrl());
             }

--
Gitblit v1.9.1