From 6bb5bd692771f1081b6221c2080adfd4ecc806fb Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 20 Oct 2021 14:31:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=8F=AF=E4=BB=A5=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=B7=A5=E4=BD=9C=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayWorkingGroupMapper.xml       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 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 d0c4e466..d9dd9935 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
@@ -3,7 +3,7 @@
 <mapper namespace="com.jero.project.mapper.PayWorkingGroupMapper">
     <select id="queryPageList" resultType="com.jero.project.vo.PayWorkingGroupVO">
         SELECT
-            id,
+            distinct pwg.id,
             working_group_project AS workingGroupProject,
             year,
             principal_id_a AS principalIdA,
@@ -20,11 +20,11 @@
             charge_notice_b_id AS chargeNoticeBId,
             mission_and_objectives AS missionAndObjectives,
             remarks,
-            create_by AS createBy,
-            create_time AS createTime,
-            update_by AS updateBy,
-            update_time AS updateTime
-        FROM pay_working_group
+            pwg.create_by AS createBy,
+            pwg.create_time AS createTime,
+            pwg.update_by AS updateBy,
+            pwg.update_time AS updateTime
+        FROM pay_working_group pwg left join pay_meeting pm on pwg.id = pm.working_group_id
         <where>
             <if test="payWorkingGroup.workingGroupProject != null and payWorkingGroup.workingGroupProject != ''">
                 AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%'))
@@ -36,10 +36,12 @@
                 AND year = #{payWorkingGroup.year}
             </if>
             <if test="payWorkingGroup.principalA != null and payWorkingGroup.principalA != '' and payWorkingGroup.principalB != null and payWorkingGroup.principalB != ''">
-                AND (principal_id_a = #{payWorkingGroup.principalA} OR principal_id_b = #{payWorkingGroup.principalB})
+                AND (principal_id_a = #{payWorkingGroup.principalA}
+                    OR principal_id_b = #{payWorkingGroup.principalB}
+                    OR pm.director_id = #{payWorkingGroup.principalA} )
             </if>
         </where>
-        ORDER BY create_time DESC
+        ORDER BY pwg.create_time DESC
     </select>
     <select id="queryListByCompany" resultType="com.jero.project.vo.PayWorkingGroupVO">
         SELECT