From eb3d6df3d5e48f32fc7714ec357f7b6ceccc3659 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 19:57:47 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java
index 7ce5500..bee91c1 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/MessageBoardServiceImpl.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xcong.farmer.cms.common.contants.AppContants;
 import com.xcong.farmer.cms.common.response.Result;
 import com.xcong.farmer.cms.modules.system.dto.AdminAddMessageDto;
 import com.xcong.farmer.cms.modules.system.dto.AdminDeleteDto;
@@ -70,17 +71,9 @@
 
     @Override
     public Result addMessage(HttpServletRequest request, AdminAddMessageDto adminAddMessageDto) {
-        StringBuffer requestURL = request.getRequestURL();
-        List<CompanyEntity> companyEntities = companyMapper.selectList(new QueryWrapper<>());
-        Long companyId = 0L;
-        if(CollUtil.isNotEmpty(companyEntities)){
-            for(CompanyEntity companyEntity : companyEntities){
-                boolean contains = StrUtil.contains(requestURL, companyEntity.getWebAddress());
-                if(contains){
-                    companyId = companyEntity.getId();
-                }
-            }
-        }
+        String website = request.getHeader(AppContants.WEBSITE_HEADER);
+        Long companyId = getCompanyIdFromWebsite(website);
+
         String title = adminAddMessageDto.getTitle();
         String remark = adminAddMessageDto.getRemark();
         if(StrUtil.isEmpty(title) && StrUtil.isEmpty(remark)){
@@ -100,4 +93,18 @@
         this.baseMapper.insert(messageBoardEntity);
         return Result.ok("留言成功");
     }
+
+    private Long getCompanyIdFromWebsite(String website){
+        List<CompanyEntity> companyEntities = companyMapper.selectList(new QueryWrapper<>());
+        Long companyId = 0L;
+        if(CollUtil.isNotEmpty(companyEntities)){
+            for(CompanyEntity companyEntity : companyEntities){
+                boolean contains = StrUtil.contains(website, companyEntity.getWebAddress());
+                if(contains){
+                    companyId = companyEntity.getId();
+                }
+            }
+        }
+        return companyId;
+    }
 }

--
Gitblit v1.9.1