From bda6f9fb00e0e251ce7a88d2163fd6903259ee14 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 14 Nov 2025 14:27:51 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-14=20ECN=E7=9A=84bm=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ChangeManagementServiceImpl.java     |  1 +
 .../quotation/QuotationInformationMapper.xml  | 22 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index 45b5cd8d..692b2743 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -2136,6 +2136,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         changeManagementMapper.chooseItemDel(data.getSite(), data.getChangeNo());
         changeManagementMapper.chooseItemDel2(data.getSite(), data.getChangeNo());
         changeManagementMapper.chooseItemCSDel(data.getSite(), data.getChangeNo());
+        changeManagementMapper.deleteChangeTeams(data.getSite(), data.getChangeNo(), "delegateAccess");
     }
 
     @Override
diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index e705a137..7243b384 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -264,28 +264,24 @@
         a.reject_step_id,
         a.place,
         vpp.plm_part_no,
-        <if test="query.menuId != null and query.menuId != ''">
-            d.is_reject,
-            d.node_id,
-            d.node_name,
-            dbo.plm_get_user_display(d.site, d.create_by)                                         as node_create_by,
-            dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.quotation_batch_no) as approvalUsername,
-        </if>
+        d.is_reject,
+        d.node_id,
+        d.node_name,
+        dbo.plm_get_user_display(d.site, d.create_by)                                         as node_create_by,
+        dbo.get_plm_Approval_username(a.site, d.workflow_id, d.node_id, a.quotation_batch_no) as approvalUsername,
         vpp.bu_no,
         b.bu_desc,
         vpp.final_part_no,
         pcpi.customer_part_no
         FROM plm_quotation_information as a
-        <if test="query.menuId != null and query.menuId != ''">
-            left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}
-            left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id
-        </if>
+        left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}
+        left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id
         left join view_Project_Part vpp on vpp.site = a.site and vpp.test_part_no = a.test_part_no and vpp.project_id = a.project_id
         left join BU b on vpp.bu_no = b.bu_no and a.site = b.site
         left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and a.customer_no = pcpi.customer_no
         <where>
-            a.site = #{query.site}
-            and a.quotation_no not in (select inside_inquiry_no from  plm_quote where  site = #{query.site})
+            a.site = #{query.site} and d.node_id = '400'
+            and a.quotation_no not in (select inside_inquiry_no from plm_quote where site = #{query.site})
             <if test="query.createBy != null and query.createBy != ''">
                 and vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, #{query.createBy}))
             </if>