From 704e864dead4adb8519955e5f84a1d28334f1235 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Thu, 26 Oct 2023 17:42:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E9=82=80=E8=AF=B7=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/meeting/service/impl/MeetingExpertServiceImpl.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/impl/MeetingExpertServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/impl/MeetingExpertServiceImpl.java
index 0bfbb0d..4b49490 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/impl/MeetingExpertServiceImpl.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/impl/MeetingExpertServiceImpl.java
@@ -23,6 +23,7 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -102,7 +103,8 @@ public class MeetingExpertServiceImpl extends ServiceImpl<MeetingExpertMapper, M
 
     @Override
     public Page<MeetingExpert> pageExpertByStatusAndMeetingId(Page<MeetingExpert> page, Long meetingId, ExpertAttendStatusEnum status, Integer inviteType) {
-        return baseMapper.selectExpertByStatusAndMeetingId(page, status.getCode(), meetingId, inviteType);
+        Integer statusCode = Optional.ofNullable(status).flatMap(w -> Optional.of(w.getCode())).orElse(null);
+        return baseMapper.selectExpertByStatusAndMeetingId(page, statusCode, meetingId, inviteType);
     }
 
     @Override