From aaa5105fb1625a0d38e4b4ab7c33137a9750123f Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 23 Dec 2024 18:40:08 +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

---
 .../resources/mapper/material/basic/BmMessageMapper.xml   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 44004ad..2d2c8c3 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
@@ -9,7 +9,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="fromUser"    column="from_user"    />
         <result property="toUser"    column="to_user"    />
         <result property="fromCompany"    column="from_company"    />
+        <result property="fromCompanyName"    column="from_company_name"    />
         <result property="toCompany"    column="to_company"    />
+        <result property="toCompanyName"    column="to_company_name"    />
         <result property="messageType"    column="message_type"    />
         <result property="messageTopic"    column="message_topic"    />
         <result property="messageContent"    column="message_content"    />
@@ -18,7 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBmMessageVo">
-        select id, uuid, from_user, to_user, from_company, to_company, message_content, message_topic, message_type, create_time, update_time from bm_message
+        select bm.id, bm.uuid, bm.from_user, bm.to_user, bm.from_company, bm.to_company, bm.message_content, bm.message_topic,
+               bm.message_type, bm.create_time, bm.update_time, sd1.dept_name as from_company_name, sd2.dept_name as to_company_name
+        from bm_message bm
+        left join sys_dept sd1 on sd1.dept_id = bm.from_company
+        left join sys_dept sd2 on sd2.dept_id = bm.to_company
     </sql>
 
     <select id="selectBmMessageList" parameterType="com.bonus.material.basic.domain.BmMessage" resultMap="BmMessageResult">