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/system/service/Impl/ArticleServiceImpl.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
index eaca0fb..13427ba 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
@@ -292,6 +292,15 @@
             articleEntity.setTimeType(timeType);
         }
         IPage<WebArticleVo> list = this.baseMapper.selectWebArticleInPage(page,articleEntity);
+
+        if (CollUtil.isNotEmpty(list.getRecords())) {
+            for (WebArticleVo record : list.getRecords()) {
+                // 站内
+                if (record.getType() == 1) {
+                    record.setArticleUrl(record.getBaseUrl() + record.getPath() + "/" + record.getId() + ".html");
+                }
+            }
+        }
         return Result.ok(list);
     }
 

--
Gitblit v1.9.1