From 72e4c1f558c3a0ae7a3730a3b80da11f3e7729a7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Jul 2022 18:00:53 +0800
Subject: [PATCH] fix template upload
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
index 7510d74..8fbca01 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.farmer.cms.common.contants.AppContants;
import com.xcong.farmer.cms.common.response.Result;
+import com.xcong.farmer.cms.configurations.properties.CmsProperties;
import com.xcong.farmer.cms.modules.system.dto.AdminAddColumnDto;
import com.xcong.farmer.cms.modules.system.dto.AdminColumnDto;
import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
@@ -41,6 +42,8 @@
private ArticleMapper articleMapper;
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private CmsProperties cmsProperties;
@Override
public Result getColumnInPage(AdminColumnDto adminColumnDto) {
@@ -168,10 +171,14 @@
if (columnEntity.getTargetType() == 1) {
ArticleEntity articleEntity = articleMapper.selectById(Long.parseLong(columnEntity.getTargetUrl()));
adminSeeColumnInfoVo.setTargetName(articleEntity.getTitle());
+ adminSeeColumnInfoVo.setUrl(cmsProperties.getBaseUrl() + columnEntity.getPath() + "/" + columnEntity.getTargetUrl() + ".html");
} else if (columnEntity.getTargetType() == 2) {
ColumnEntity column = this.baseMapper.selectByCodeAndCompanyId(columnEntity.getTargetUrl(), LoginUserUtil.getCompanyId());
adminSeeColumnInfoVo.setTargetName(column.getColumnName());
+ adminSeeColumnInfoVo.setUrl(cmsProperties.getBaseUrl() + column.getPath());
}
+ } else {
+ adminSeeColumnInfoVo.setUrl(cmsProperties.getBaseUrl() + columnEntity.getPath());
}
adminSeeColumnInfoVo.setTargetUrl(columnEntity.getTargetUrl());
return Result.ok(adminSeeColumnInfoVo);
--
Gitblit v1.9.1