From c65de06d2339dbdd7cf607b02dc8bd947816ac3d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 3 Nov 2021 18:41:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041839=20=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/meeting/mapper/PayMeetingMapper.java     | 2 ++
 .../java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml  | 7 +++++++
 .../jero/meeting/service/impl/PayMeetingServiceImpl.java   | 7 +++++++
 3 files changed, 16 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
index 9edd7532..30363316 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java
@@ -25,4 +25,6 @@ public interface PayMeetingMapper extends BaseMapper<PayMeeting> {
     IPage<PayMeeting> internelPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
 
     IPage<PayMeeting> workGroupPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
+
+    IPage<PayMeeting> standardPage(Page<PayMeeting> page, @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
index 8eea009f..5ddea2e1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
@@ -102,4 +102,11 @@
         left join pay_working_group pwg on pwg.id = pm.working_group_id
         ${ew.customSqlSegment}
     </select>
+
+    <select id="standardPage" resultMap="PayMeetingResultMap">
+        select distinct pm.*
+        from pay_meeting pm
+        left join tb_member_project tmp on tmp.id = pm.standards_id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index e370e4b2..6b31b0ab 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -623,6 +623,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                                     .eq("dock_id", sysUser.getId())
                     );
                     pageList = baseMapper.internelPage(page,queryWrapper);
+                }else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)) {
+                    queryWrapper.and(
+                            a -> a.eq("tmp.director_id", sysUser.getId())
+                                    .or()
+                                    .eq("pm.director_id", sysUser.getId())
+                    );
+                    pageList = baseMapper.standardPage(page,queryWrapper);
                 }else {
                     queryWrapper.eq("director_id", sysUser.getId());
                     pageList = page(page, queryWrapper);