Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

Helius

2022-07-12 3a8d8b6de6daf6e7198a2b8d562dc2fbf49a4a2a

 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);
    }