From 9327268d9580007afb8fc3fe5dd2841aee3832a7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 15:15:58 +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/CmsTemplateServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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..dc2c206 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
@@ -155,6 +155,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 +170,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