From b1e35e8f4375b338104f31510af18335115a4330 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 20 Sep 2024 15:31:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/base/TbBdDeviceRecordMapper.xml  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml
index c084b08..159e43e 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml
@@ -198,12 +198,15 @@
 
 <!--by syruan on 2024-09-11-->
   <select id="getAll" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tb_bd_device_record
+    select
+    tbdr.id, tbdr.record_id, tbdr.dev_name, tbdr.dev_code, tbdr.unit_name, tbdr.area_name, tbdr.dev_user, tbdr.dev_user_phone,
+    tbr.audit_user as auditUser, tbr.audit_time as auditTime, su.nick_name as auditUserName
+    from tb_bd_device_record tbdr
+    left join tb_bd_record tbr on tbdr.record_id = tbr.id
+    left join sys_user su on tbr.audit_user = su.user_id
     <where>
       <if test="recordId != null">
-        and record_id = #{recordId}
+        and tbdr.record_id = #{recordId}
       </if>
     </where>
     </select>