From 08e5cfa5651c15a79bcbcff2b04a1dda6c5c961b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 16:19:28 +0800
Subject: [PATCH] fix
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 58c80e2..c22967f 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
@@ -53,6 +53,7 @@
public void updateTemplate(MultipartFile upload) {
String templatePath = properties.getTemplatePath();
String staticPath = properties.getStaticPath();
+ Long companyId = LoginUserUtil.getCompanyId();
String filename = upload.getOriginalFilename();
String suffix = filename.substring(filename.lastIndexOf("."));
@@ -94,7 +95,7 @@
Document parse = Jsoup.parse(templateFile, null);
String attr = parse.head().attr("name");
CmsTemplateEntity cmsTemplate = new CmsTemplateEntity();
- cmsTemplate.setCompanyId(10L);
+ cmsTemplate.setCompanyId(companyId);
if (name.endsWith(".list.html")) {
cmsTemplate.setType(2);
} else if (name.endsWith(".article.html")) {
@@ -116,7 +117,7 @@
Document parse = Jsoup.parse(file, null);
String attr = parse.head().attr("name");
CmsTemplateEntity cmsTemplate = new CmsTemplateEntity();
- cmsTemplate.setCompanyId(LoginUserUtil.getCompanyId());
+ cmsTemplate.setCompanyId(companyId);
if (file.getName().endsWith(".list.html")) {
cmsTemplate.setType(2);
} else if (file.getName().endsWith(".article.html")) {
@@ -155,6 +156,7 @@
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);
}
@@ -169,7 +171,7 @@
String baseUrl = cmsProperties.getBaseUrl();
String templatePath = cmsProperties.getTemplatePath();
String htmlUrl = baseUrl + templatePath;
- String pathName = htmlUrl + "\\" + cmsTemplateEntity.getPath();
+ String pathName = htmlUrl + "/" + cmsTemplateEntity.getPath();
byte[] bytes = new byte[0];
try {
--
Gitblit v1.9.1