From 1facfdc9361d888d72c959bac4d8fb05dcad02d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 18:27:06 +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 |    5 +++--
 1 files changed, 3 insertions(+), 2 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 85c2902..897950c 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")) {

--
Gitblit v1.9.1