From 543a810bfb51ba348c74a6740f00c7f9600699ea Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 8 Aug 2023 15:23:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=81=E4=B8=9A=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/project/mapper/xml/PayWorkingGroupMapper.xml    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 9f875de2..46da1cf3 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
@@ -1284,7 +1284,7 @@
     <select id="queryPageListForCompany" resultType="com.jero.statistics.entity.CompanyComeMoneyList">
         select * from (
         select chargeCompanyTemporaryId as chargeCompanyId,
-        chargeCompanyTemporaryName as chargeCompanyName,
+        pcm.company_name as chargeCompanyName,
         allMoney,
         comeAllMoney,
         createTime,
@@ -1292,7 +1292,6 @@
         billMoney,
         confirmAmount from
         (select chargeCompanyId as chargeCompanyTemporaryId,
-        chargeCompanyTemporaryName,
         SUM(allMoney) as allMoney,
         sum(paidNoTaxAmount) as comeAllMoney,
         createTime,
@@ -1347,7 +1346,7 @@
             </choose>-->
         </where>
         group by chargeCompanyId
-        ) ppp
+        ) ppp left join pay_company_management pcm on ppp.chargeCompanyTemporaryId = pcm.id
         <where>
             <choose>
                 <when test="companyComeMoneySearch.allMoney != null and companyComeMoneySearch.allMoney != '' and companyComeMoneySearch.allMoneyTwo != null and companyComeMoneySearch.allMoneyTwo != ''">