From df1f128feb96f999f6b2fcbcae8eae72f584dbe5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 04 六月 2026 15:55:24 +0800
Subject: [PATCH] 过程检、成品检报告需展示客户名称(生产订单对应带出来的),检测单位固定是 天津阳光彩印股份有限公司

---
 src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
index c34b460..0fb44e9 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>

--
Gitblit v1.9.3