From 49f03b802c21f25c5838e9b1989b8cf09534a691 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 20 Dec 2024 15:00:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/basic/domain/BmMessage.java   | 8 ++++----
 .../material/basic/service/impl/BmMessageServiceImpl.java | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java
index 5d36b89..8d47b25 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java
@@ -45,20 +45,20 @@ public class BmMessage extends BaseEntity {
     /** 来自userId */
     @Excel(name = "来自userId")
     @ApiModelProperty(value = "来自userId")
-    private String fromUser;
+    private Long fromUser;
 
     /** 发给userId */
     @Excel(name = "发给userId")
     @ApiModelProperty(value = "发给userId")
-    private String toUser;
+    private Long toUser;
 
     /** 来自companyId */
     @Excel(name = "来自companyId")
     @ApiModelProperty(value = "来自companyId")
-    private String fromCompany;
+    private Long fromCompany;
 
     /** 发给companyId */
     @Excel(name = "发给companyId")
     @ApiModelProperty(value = "发给companyId")
-    private String toCompany;
+    private Long toCompany;
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java
index 0c6bda2..7879473 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java
@@ -9,6 +9,7 @@ import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.redis.service.RedisService;
 import com.bonus.common.security.config.VerificationCodeConfig;
+import com.bonus.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.material.basic.mapper.BmMessageMapper;
@@ -65,6 +66,8 @@ public class BmMessageServiceImpl implements IBmMessageService {
     public int insertBmMessage(BmMessage bmMessage) {
         bmMessage.setCreateTime(DateUtils.getNowDate());
         try {
+            bmMessage.setFromCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
+            bmMessage.setFromUser(SecurityUtils.getLoginUser().getSysUser().getUserId());
             bmMessage.setUuid(String.valueOf(UUID.randomUUID()));
             String msgKey = MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_CODE;
             String msgContent = JSONObject.toJSONString(bmMessage);