From 9f2f28c2689085c7a95be6b47122c29bb41210f4 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 1 Nov 2021 17:03:55 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2041816=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE--=E4=BC=9A=E8=AE=AE=E7=BB=B4=E6=8A=A4--?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA=E5=BA=94=E8=AF=A5=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=9A=84=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/meeting/mapper/PayMeetingMapper.java | 4 ++++ .../mapper/PayMeetingSituationMapper.java | 2 ++ .../meeting/mapper/xml/PayMeetingMapper.xml | 8 +++++++ .../mapper/xml/PayMeetingSituationMapper.xml | 13 +++++++++-- .../service/impl/PayMeetingServiceImpl.java | 19 +++++++++++---- .../impl/PayMeetingSituationServiceImpl.java | 23 +++++++++++++++---- 6 files changed, 59 insertions(+), 10 deletions(-) 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 aee0fa99..9edd7532 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 @@ -8,6 +8,8 @@ import org.apache.ibatis.annotations.Param; import com.jero.meeting.entity.PayMeeting; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** * @Description: 会议管理 * @Author: jero-boot @@ -21,4 +23,6 @@ public interface PayMeetingMapper extends BaseMapper { @Param("now") String now); IPage internelPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage workGroupPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java index 27ffb792..09f914ff 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingSituationMapper.java @@ -22,4 +22,6 @@ public interface PayMeetingSituationMapper extends BaseMapper pageListContract(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage pageListContractWorkGroup(Page page, + @Param(Constants.WRAPPER) QueryWrapper 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 d13b97b9..50366add 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 @@ -92,4 +92,12 @@ left join pay_meeting_situation pms on pm.id = pms.meeting_id ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml index f685734d..3cc16177 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml @@ -155,8 +155,17 @@ + + \ 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 81c88702..372313a8 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 @@ -577,16 +577,27 @@ public class PayMeetingServiceImpl extends ServiceImpl a.eq("pwg.principal_id_a", sysUser.getId()) + .or() + .eq("pwg.principal_id_b", sysUser.getId()) + .or() + .eq("dock_id", sysUser.getId()) + .or() + .eq("pm.director_id", sysUser.getId()) + ); + pageList = baseMapper.workGroupPage(page,queryWrapper); + }else if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)){ queryWrapper.and( a -> a.eq("director_id", sysUser.getId()) .or() .eq("dock_id", sysUser.getId()) ); pageList = baseMapper.internelPage(page,queryWrapper); + }else { + queryWrapper.eq("director_id", sysUser.getId()); + pageList = page(page, queryWrapper); } }else { pageList = page(page, queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index a1787950..562568a2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -726,18 +726,33 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl pageListContract(Page page, QueryWrapper queryWrapper,Integer meetingType) { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userId = loginUser.getId(); + queryWrapper.eq("pm.meeting_type",meetingType); if (!rolePermissionService.getRolePermission("committeeMeetingSituation:search")) { + if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){ + queryWrapper.and( + a -> a.eq("pms.dock_id", userId) + .or() + .eq("pm.director_id", userId) + .or() + .eq("pwg.principal_id_a", userId) + .or() + .eq("pwg.principal_id_b", userId) + ); + return baseMapper.pageListContractWorkGroup(page,queryWrapper); + } if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)){ queryWrapper.and( - a -> a.eq("pms.dock_id",loginUser.getId()) + a -> a.eq("pms.dock_id", userId) .or() - .eq("pm.director_id",loginUser.getId()) + .eq("pm.director_id", userId) ); + return baseMapper.pageListContract(page,queryWrapper); }else { - queryWrapper.eq("pm.director_id", loginUser.getId()); + queryWrapper.eq("pm.director_id", userId); + return baseMapper.pageListContract(page,queryWrapper); } } - queryWrapper.eq("pm.meeting_type",meetingType); return baseMapper.pageListContract(page,queryWrapper); }