From 8126377930f7d1a0ae2b335088cd11f1a70e4aaa Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Aug 2022 14:16:23 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java |    9 ++++-----
 1 files changed, 4 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 d2e1980..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
@@ -180,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);
     }
@@ -217,15 +217,14 @@
         Long id = adminSaveTemplateInfoDto.getId();
 
         CompanyEntity company = this.companyMapper.selectById(companyId);
-        CmsTemplateEntity cmsTemplateEntity = this.baseMapper.selectByIdAndCompanyId(id,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);
-        pathNew = FileUtils.path(pathNew, company.getCode());
         log.info("模板写入地址:{}", pathNew);
         File file = new File(pathNew);
         FileUtil.touch(file);

--
Gitblit v1.9.1