From 828e66e8228ffabdfcf108d0ada322a36cf220bf Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 4 Mar 2025 09:44:27 +0800
Subject: [PATCH] 2025-03-04

---
 .../mapper/part/PartInformationMapper.xml     | 30 +++++++++++--------
 .../proofing/ProofingInformationMapper.xml    |  7 +++--
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index caa9fcb1..65b6a5c7 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -1998,25 +1998,29 @@
     </update>
 
     <select id="queryPartByPartNo" resultType="com.spring.modules.part.entity.PartInformationEntity">
-        select
-        site,
-        part_no,
-        part_desc,
-        spec,
-        part_type_db,
-        dbo.get_part_unitCost(site, part_no) as standardCost,
-        status,
-        um_id
-        from part
+        select p.site,
+               p.part_no,
+               p.part_desc,
+               p.spec,
+               p.part_type_db,
+               dbo.get_part_unitCost(p.site, p.part_no) as standardCost,
+               p.status,
+               p.um_id,
+               p.ifs_part_no,
+               p.configuration_id
+        from part p
         where active = 'Y'
         <if test="params.site != null and params.site != ''">
-            and site = #{params.site}
+            and p.site = #{params.site}
         </if>
         <if test="params.partNo != null and params.partNo != ''">
-            and part_no like #{params.partNo}
+            and p.part_no like #{params.partNo}
         </if>
         <if test="params.partDesc != null and params.partDesc != ''">
-            and part_desc like #{params.partDesc}
+            and p.part_desc like #{params.partDesc}
+        </if>
+        <if test="params.ifsPartNo != null and params.ifsPartNo != ''">
+            and p.ifs_part_no like #{params.ifsPartNo}
         </if>
     </select>
 
diff --git a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
index 5d0f339e..98656783 100644
--- a/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
+++ b/src/main/resources/mapper/proofing/ProofingInformationMapper.xml
@@ -155,10 +155,11 @@
     <select id="searchDelegateAccessByUser" resultType="com.spring.modules.proofing.vo.ProofingDelegateAccessVo">
         select a.username as delegateAccess, a.user_display as delegateAccessName
         from sys_user a
-                 left join AccessRole b on a.username = b.username and a.site = b.site
-        where b.role_no = #{roleId} and a.site = #{params.site}
+                 left join AccessSite c on a.username = c.UserID and c.site = #{params.site}
+                 left join AccessRole b on c.UserID = b.username and c.site = b.site
+        where b.role_no = #{roleId}
         <if test="params.delegateAccess != null and params.delegateAccess != ''">
-            and  a.username like #{params.delegateAccess}
+            and a.username like #{params.delegateAccess}
         </if>
         <if test="params.delegateAccessName != null and params.delegateAccessName != ''">
             and a.user_display like #{params.delegateAccessName}