From a27fdf6b900e267eb84e1c6a5e1a693ee90d1274 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 10 九月 2026 21:17:05 +0800
Subject: [PATCH] feat(stock): 添加库存报表导出功能并完善库存入库字段Excel注解
---
src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
index c34b460..89d0869 100644
--- a/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
@@ -13,10 +13,13 @@
</resultMap>
<select id="listPage" resultMap="RulesRegulationsManagementDTOMap">
- select rrm.*, su.user_name as create_user_name
+ select rrm.*, su.nick_name as create_user_name
from rules_regulations_management rrm
left join sys_user su on rrm.create_user = su.user_id
<where>
+ <if test="ew.regulationNum != null and ew.regulationNum != ''">
+ and rrm.regulation_num = #{ew.regulationNum}
+ </if>
<if test="ew.title != null and ew.title != ''">
and rrm.title like concat('%',#{ew.title},'%')
</if>
@@ -25,4 +28,4 @@
</if>
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3