From ca00bf1995a7b074d66bc3c2e176c2b715f53c04 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 28 Oct 2021 18:20:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041534=20=E6=94=B6=E5=85=A5=E5=90=88?=
 =?UTF-8?q?=E5=90=8C-=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE-=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BC=9A=E8=AE=AE-=E7=82=B9=E5=87=BB=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E-=E7=82=B9=E5=87=BB=E9=80=89=E6=8B=A9=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E9=A1=B5=E9=9D=A2---=E8=BF=99=E5=9D=97=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84=E4=BC=9A=E8=AE=AE=E6=B2=A1=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingServiceImpl.java   | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

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<PayMeetingMapper, PayMeet
         IPage<PayMeeting> 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());