From dcb772cf7ccc23f8393202b8803d45b9766d0a7b Mon Sep 17 00:00:00 2001
From: zhangqinlin <1500920753@qq.com>
Date: Sat, 9 Oct 2021 09:54:47 +0800
Subject: [PATCH] =?UTF-8?q?bug-=E5=88=86=E6=A0=87=E5=A7=94=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E6=B7=BB=E5=8A=A0=E5=BE=85=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/mapper/xml/PayCaseCommitteeSubitemMapper.xml    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
index 7a2a8cfc..5f0d988c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
@@ -18,12 +18,13 @@
         pay_case_committee pe
         left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id)
         left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
+        left join pay_company_management pcm on(pm.company_id=pcm.id)
         <where>
             <if test=" name!=null and name != ''">
                 AND pt.name LIKE CONCAT('%',#{name},'%')
             </if>
             <if test=" companyName!=null and companyName != ''">
-                AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
+                AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
             </if>
             <if test=" fenBiaoWeiName!=null and fenBiaoWeiName != ''">
                 AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%')
@@ -33,14 +34,14 @@
         order by pe.create_time desc
     </select>
     <select id="listForChildren" resultType="com.jero.data.entity.ChildrenFindByName">
-        SELECT pt.name as peopleName,pm.company_name as companyName,pt.post as post,pt.phone as phone ,pm.id as childrenId
+        SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as childrenId
         from
        pay_case_committee_subitem pm
-        left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
+        left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
         <where>
             pm.committee_id = #{pid}
             <if test=" companyName!=null and companyName != ''">
-                AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
+                AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
             </if>
             <if test=" tname!=null and tname != ''">
                 AND pt.name LIKE CONCAT('%',#{tname},'%')