From 0548f84f22762a13cf3b076337d71194c5c358ba Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 25 Oct 2021 16:07:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=2041219=20=E8=AE=BE=E7=BD=AE=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E4=BA=BA=E5=90=8E=EF=BC=8C=E5=AF=B9=E6=8E=A5=E4=BA=BA?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E7=9C=8B=E5=88=B0=E4=BC=9A=E8=AE=AE=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=90=E9=98=BB=E5=A1=9E=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SendMessageServiceImpl.java  |  3 ++-
 .../jero/meeting/mapper/PayMeetingMapper.java |  2 ++
 .../meeting/mapper/xml/PayMeetingMapper.xml   |  7 ++++++
 .../service/impl/PayMeetingServiceImpl.java   | 24 +++++++++++++++----
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
index 3cf1ddb6..4694c559 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
@@ -77,7 +77,8 @@ public class SendMessageServiceImpl implements SendMessageService {
         if(!Objects.isNull(map)) {
             // 替换企业端系统url与小程序名称
             // todo 替换系统地址，小程序名称
-            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
+            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())
+                    ||Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode())
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 2fa22c79..aee0fa99 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
@@ -19,4 +19,6 @@ public interface PayMeetingMapper extends BaseMapper<PayMeeting> {
     IPage<PayMeeting> pageListContract(Page<PayMeeting> page,
                                        @Param(Constants.WRAPPER) QueryWrapper<PayMeeting> queryWrapper,
                                        @Param("now") String now);
+
+    IPage<PayMeeting> internelPage(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 2b48ff04..d13b97b9 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
@@ -85,4 +85,11 @@
                      left join pay_meeting_remind_record pmrr on pm.id = pmrr.meeting_id
                 ${ew.customSqlSegment}
     </select>
+
+    <select id="internelPage" resultMap="PayMeetingResultMap">
+        select distinct pm.*
+        from pay_meeting pm
+        left join pay_meeting_situation pms on pm.id = pms.meeting_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 21fde651..8dac46cd 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
@@ -512,9 +512,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
     @Override
     public IPage<PayMeeting> queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (!rolePermissionService.getRolePermission("generalProject:search")) {
-            payMeeting.setDirectorId(sysUser.getId());
-        }
+
         QueryWrapper<PayMeeting> queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap());
         String meetingStartTime = req.getParameter("meetingStartTime");
         String meetingEndTime = req.getParameter("meetingEndTime");
@@ -531,9 +529,25 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                     a -> a.gt("start_time", meetingEndTime)
             );
         }
-
         Page<PayMeeting> page = new Page<>(pageNo, pageSize);
-        IPage<PayMeeting> pageList = page(page, queryWrapper);
+        IPage<PayMeeting> pageList;
+        if (!rolePermissionService.getRolePermission("generalProject:search")) {
+            if (!payMeeting.getMeetingType().equals(MeetingCommon.INTERNATIONAL_MEETING_INT)) {
+                payMeeting.setDirectorId(sysUser.getId());
+                pageList = page(page, queryWrapper);
+            }else {
+                queryWrapper.and(
+                        a -> a.eq("director_id", sysUser.getId())
+                                .or()
+                                .eq("dock_id", sysUser.getId())
+                );
+                pageList = baseMapper.internelPage(page,queryWrapper);
+            }
+        }else {
+            pageList = page(page, queryWrapper);
+        }
+
+
         for (PayMeeting meeting : pageList.getRecords()) {
             //查询会议负责人
             LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());