From c01dc598ccc10cc954c17ed183607a44b4878ed4 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 20 Dec 2024 15:21:10 +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

---
 .../material/basic/service/impl/BmMessageServiceImpl.java   | 5 -----
 .../resources/mapper/material/basic/BmMessageMapper.xml     | 6 ++----
 2 files changed, 2 insertions(+), 9 deletions(-)

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 d4250e0..5353dad 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
@@ -4,13 +4,11 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import com.alibaba.fastjson2.JSONObject;
 import com.bonus.common.biz.constant.MaterialConstants;
 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;
@@ -24,9 +22,6 @@ public class BmMessageServiceImpl implements IBmMessageService {
     @Autowired
     private BmMessageMapper bmMessageMapper;
 
-    @Resource
-    private VerificationCodeConfig verificationCodeConfig;
-
     @Resource
     private RedisService redisService;
 
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml
index dc559ff..ef695c3 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml
@@ -25,10 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectBmMessageVo"/>
         <where>  
             <if test="uuid != null  and uuid != ''"> and uuid = #{uuid}</if>
-            <if test="fromUser != null  and fromUser != ''"> and from_user = #{fromUser}</if>
-            <if test="toUser != null  and toUser != ''"> and to_user = #{toUser}</if>
-            <if test="fromCompany != null  and fromCompany != ''"> and from_company = #{fromCompany}</if>
-            <if test="toCompany != null  and toCompany != ''"> and to_company = #{toCompany}</if>
+            <if test="fromUser != null and toUser != null"> and (from_user = #{fromUser} or to_user = #{toUser})</if>
+            <if test="fromCompany != null and toCompany != null"> and (from_company = #{fromCompany} or to_company = #{toCompany})</if>
             <if test="messageContent != null  and messageContent != ''"> and message_content = #{messageContent}</if>
             <if test="messageTopic != null  and messageTopic != ''"> and message_topic = #{messageTopic}</if>
             <if test="messageType != null  and messageType != ''"> and message_type = #{messageType}</if>