From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 14:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency
---
basic-server/src/main/resources/mapper/StandardProductListUpdateRecordMapper.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardProductListUpdateRecordMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListUpdateRecordMapper.xml
index c6f7d17..e3a5a2e 100644
--- a/basic-server/src/main/resources/mapper/StandardProductListUpdateRecordMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardProductListUpdateRecordMapper.xml
@@ -3,10 +3,18 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardProductListUpdateRecordMapper">
- <select id="standardProductListRecordPage" resultType="com.ruoyi.basic.pojo.StandardProductListUpdateRecord">
- select * from standard_product_list_update_record
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
+ <select id="standardProductListRecordPage" resultType="com.ruoyi.basic.dto.StandardProductListUpdateRecordDto">
+ SELECT *,
+ T2.name AS create_user_name,
+ T3.name AS update_user_name
+ FROM
+ standard_product_list_update_record T1
+ LEFT JOIN user T2 ON T1.create_user = T2.id
+ LEFT JOIN user T3 ON T1.update_user = T3.id
+ <where>
+ <if test="record.createUserName != null and record.createUserName != ''">
+ T2.name like concat('%',#{record.createUserName},'%')
+ </if>
+ </where>
</select>
</mapper>
--
Gitblit v1.9.3