From f417bbbbd9fc28df986b4d950dfd5039ddb3873f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Fri, 5 Nov 2021 00:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/mapper/xml/PayPaymentRecordMapper.xml    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
index 5b92c554..7aeec2b3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
@@ -60,18 +60,18 @@
         </if>
         <!-- 会员项目-->
         UNION ALL
-        select msub.id,member.project_name,msub.charge_use,member.director_id,su.realname,msub.company_id,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,msub.invoice_amount,msub.post_contact_id,'' as register_check_result,msub.company_contact_name
-        from pay_member_project member
-        inner join pay_member_project_subitem msub on member.id=msub.project_id
-        left join sys_user su on su.id = member.director_id
+        select msub.id,pmp.project_name,msub.charge_use,pmp.director_id,su.realname,msub.company_id,msub.company_name,msub.amount_receivable,msub.paid_amount,msub.need_invoice,msub.pack,msub.in_account,msub.make_invoice,msub.mail,msub.create_time,4,msub.invoice_amount,msub.post_contact_id,'' as register_check_result,msub.company_contact_name
+        from pay_member_project pmp
+        inner join pay_member_project_subitem msub on pmp.id=msub.project_id
+        left join sys_user su on su.id = pmp.director_id
         where
         msub.amount_receivable <![CDATA[<>]]> 0
         and msub.amount_receivable is not null
         <if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
-            AND member.director_id = #{payCommonProject.principalId}
+            AND pmp.director_id = #{payCommonProject.principalId}
         </if>
         <if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
-            AND member.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
+            AND pmp.project_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
         </if>
         <if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
             AND msub.company_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%'))