diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
index c0576888..8f89325e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml
@@ -25,6 +25,10 @@
left join sys_user su on pdg.principal_id_a = su.id
left join sys_user su1 on pdg.principal_id_b = su1.id
left join pay_working_group pwg on pwg.id = pdg.working_group_id
+
+ left join pay_meeting pm on pdg.id = pm.drafting_group_id
+ left join pay_meeting_contacts pmc on pm.id = pmc.meeting_id
+
@@ -32,11 +36,6 @@
left JOIN pay_drafting_group_subitem_contacts pdgsc on pdgsc.drafting_group_sub_id = pdgs.id
-
-
-
-
-
AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%'))
@@ -49,8 +48,12 @@
AND working_group_id = #{payDraftingGroup.workingGroupId}
-
- AND pwg.working_group_project like concat('%', #{payDraftingGroup.workingGroupName}, '%')
+
+ AND (pdg.principal_id_a = #{payDraftingGroup.principalA}
+ OR pdg.principal_id_b = #{payDraftingGroup.principalB}
+ OR pm.director_id = #{payDraftingGroup.principalA}
+ OR pmc.meeting_contacts_id = #{payDraftingGroup.principalA}
+ )
and pdgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%')