From 59349637aa5b2cca1d3500e3e55777c7138d6945 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 29 Sep 2021 15:48:01 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=AB=AF-=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE-=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=82=E4=BC=9A=E4=BA=BA=E7=9A=84=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/controller/PayMeetingController.java   | 14 ++++++++++----
 .../jero/meeting/mapper/xml/PayMeetingMapper.xml   |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 8d038d7b..e42e3bba 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -44,6 +44,7 @@ import com.jero.util.QrcodeUtil;
 import io.swagger.annotations.ApiImplicitParam;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
@@ -156,16 +157,21 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
         String now = DateUtil.formatDate(new Date());
         switch (meetingStatus) {
             case MeetingCommon.MEETING_STATUS_2:
-                queryWrapper.gt("start_time", now);
+                queryWrapper.gt("date_format(start_time,'%Y-%m-%d')", now);
                 break;
             case MeetingCommon.MEETING_STATUS_3:
-                queryWrapper.ge("end_time", now);
-                queryWrapper.le("start_time", now);
+                queryWrapper.le("date_format(start_time,'%Y-%m-%d')", now);
+                queryWrapper.ge("date_format(end_time,'%Y-%m-%d')", now);
                 break;
             case MeetingCommon.MEETING_STATUS_4:
-                queryWrapper.le("end_time", now);
+                queryWrapper.le("date_format(end_time,'%Y-%m-%d')", now);
                 break;
         }
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String id = sysUser.getId();
+        queryWrapper.and(
+                a -> a.eq("pms.company_contact_id",id).or().eq("pms.post_contact_id",id)
+        );
 
         Page<PayMeeting> page = new Page<>(pageNo, pageSize);
         IPage<PayMeeting> pageList = payMeetingService.pageListContract(page, 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 d0365e09..39a38050 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
@@ -37,6 +37,6 @@
         select pm.*,pms.pay_mode
         from pay_meeting pm
             left join pay_meeting_situation pms on pm.id = pms.meeting_id
-        #{ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 </mapper>
\ No newline at end of file