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 b4558af2..720decd9 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 @@ -565,35 +565,38 @@ public class PayMeetingServiceImpl extends ServiceImpl pageList; String permission = null; Integer meetingType = payMeeting.getMeetingType(); - if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){ - permission = "workGroupMeeting:search"; - }else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)){ - permission = "standardMeeting:search"; - }else if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)){ - permission = "internalMeeting:search"; - }else if (meetingType.equals(MeetingCommon.OTHER_MEETING_INT)){ - permission = "otherMeeting:search"; - }else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)){ - permission = "committeeMeeting:search"; + if (meetingType != null) { + if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){ + permission = "workGroupMeeting:search"; + }else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)){ + permission = "standardMeeting:search"; + }else if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)){ + permission = "internalMeeting:search"; + }else if (meetingType.equals(MeetingCommon.OTHER_MEETING_INT)){ + permission = "otherMeeting:search"; + }else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)){ + permission = "committeeMeeting:search"; + } } - - if (!Objects.equals(permission,"standardMeeting:search") && !rolePermissionService.getRolePermission(permission)) { - if (!meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)) { - queryWrapper.eq("director_id", sysUser.getId()); - pageList = page(page, queryWrapper); + if (StringUtils.isNotBlank(permission)) { + if (!Objects.equals(permission,"standardMeeting:search") && !rolePermissionService.getRolePermission(permission)) { + if (!meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)) { + queryWrapper.eq("director_id", 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 { - queryWrapper.and( - a -> a.eq("director_id", sysUser.getId()) - .or() - .eq("dock_id", sysUser.getId()) - ); - pageList = baseMapper.internelPage(page,queryWrapper); + pageList = page(page, queryWrapper); } }else { pageList = page(page, queryWrapper); } - - for (PayMeeting meeting : pageList.getRecords()) { //查询会议负责人 LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());