From b48e1a792a0196d15c582045e09dfa77c738f892 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 12 Oct 2022 10:03:30 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=20=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/project/entity/PayWorkingGroup.java  | 4 ++++
 .../com/jero/project/mapper/xml/PayWorkingGroupMapper.xml   | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java
index 3da975c6..eba69c53 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java
@@ -153,4 +153,8 @@ public class PayWorkingGroup implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "企业联系人")
     private String companyContactName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "企业名称")
+    private String companyName;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index ea33ec33..3c0af568 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -31,7 +31,8 @@
             left join pay_meeting pm on pwg.id = pm.working_group_id
             left join pay_meeting_contacts pmc on pm.id = pmc.meeting_id
         </if>
-        <if test="payWorkingGroup.companyContactName != null and payWorkingGroup.companyContactName != ''">
+        <if test="(payWorkingGroup.companyContactName != null and payWorkingGroup.companyContactName != '')
+        or (payWorkingGroup.companyName != null and payWorkingGroup.companyName != '')">
             left join pay_working_group_subitem pwgs on pwg.id = pwgs.working_group_id
             left JOIN pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pwgs.id
         </if>
@@ -55,6 +56,9 @@
             <if test="payWorkingGroup.companyContactName != null and payWorkingGroup.companyContactName != ''">
                 and pwgsc.contacts_temporary_name like concat('%', #{payWorkingGroup.companyContactName}, '%')
             </if>
+            <if test="payWorkingGroup.companyName != null and payWorkingGroup.companyName != ''">
+                and pwgs.charge_company_temporary_name like concat('%', #{payWorkingGroup.companyName}, '%')
+            </if>
         </where>
         ORDER BY pwg.create_time DESC
     </select>