From fce8e677dd4f4b7b34c01f481c17d19fcf4465cb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 19 Aug 2022 17:00:14 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
index 2467205..b0022d6 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
@@ -20,6 +20,7 @@
import com.xcong.farmer.cms.modules.system.mapper.CompanyMapper;
import com.xcong.farmer.cms.modules.system.service.ICmsTemplateService;
import com.xcong.farmer.cms.modules.system.util.LoginUserUtil;
+import lombok.extern.slf4j.Slf4j;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@@ -42,6 +43,7 @@
* @author wzy
* @date 2022-07-04
**/
+@Slf4j
@Service
public class CmsTemplateServiceImpl extends ServiceImpl<CmsTemplateMapper, CmsTemplateEntity> implements ICmsTemplateService {
@@ -178,7 +180,7 @@
public Result dropdownList() {
Long companyId = LoginUserUtil.getCompanyId();
QueryWrapper<CmsTemplateEntity> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("company_id",companyId);
+ objectQueryWrapper.eq("company_id", companyId);
List<CmsTemplateEntity> cmsTemplateEntities = this.baseMapper.selectList(objectQueryWrapper);
return Result.ok(cmsTemplateEntities);
}
@@ -189,8 +191,10 @@
@Override
public Result viewTemplateInfo(Long id) {
Result result = new Result();
+
+ CompanyEntity companyEntity = companyMapper.selectById(LoginUserUtil.getCompanyId());
CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectById(id);
- String templatePath = cmsProperties.getTemplatePath();
+ String templatePath = FileUtils.path(cmsProperties.getTemplatePath(), companyEntity.getCode());
String pathName = FileUtils.path(templatePath, cmsTemplateEntity.getPath());
byte[] bytes = new byte[0];
@@ -211,14 +215,17 @@
public Result saveTemplateInfo(AdminSaveTemplateInfoDto adminSaveTemplateInfoDto) {
Long companyId = LoginUserUtil.getCompanyId();
Long id = adminSaveTemplateInfoDto.getId();
- CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectByIdAndCompanyId(id,companyId);
+
+ CompanyEntity company = this.companyMapper.selectById(companyId);
+ CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectByIdAndCompanyId(id, companyId);
String name = cmsTemplateEntity.getName();
Integer type = cmsTemplateEntity.getType();
- String templatePath = cmsProperties.getTemplatePath();
+ String templatePath = FileUtils.path(cmsProperties.getTemplatePath(), company.getCode());
String path = cmsTemplateEntity.getPath();
- this.baseMapper.delete(id,companyId);
+ this.baseMapper.delete(id, companyId);
String pathNew = FileUtils.path(templatePath, path);
+ log.info("模板写入地址:{}", pathNew);
File file = new File(pathNew);
FileUtil.touch(file);
--
Gitblit v1.9.1