Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/meeting/helper/ExpertInviteHelper.java

@@ -13,6 +13,7 @@ import com.ningdatech.pmapi.meeting.entity.dto.AbstractInviteRule;
 import com.ningdatech.pmapi.meeting.entity.dto.AppointInviteRuleDTO;
 import com.ningdatech.pmapi.meeting.entity.dto.AvoidRuleDTO;
 import com.ningdatech.pmapi.meeting.entity.enumeration.ExpertAttendStatusEnum;
+import com.ningdatech.pmapi.meeting.entity.enumeration.MeetingStatusEnum;
 import com.ningdatech.pmapi.meeting.service.IMeetingExpertService;
 import com.ningdatech.pmapi.meeting.service.IMeetingService;
 import lombok.AllArgsConstructor;
@@ -50,6 +51,7 @@ public class ExpertInviteHelper {
     public List<Long> listInvitedExpertByTime(LocalDateTime start, LocalDateTime end) {
         LambdaQueryWrapper<Meeting> meetingQuery = Wrappers.lambdaQuery(Meeting.class)
                 .select(Meeting::getId)
+                .eq(Meeting::getStatus, MeetingStatusEnum.NORMAL.getCode())
                 .and(wrapper -> wrapper.between(Meeting::getStartTime, start, end)
                         .or(wrapper1 -> wrapper1.between(Meeting::getEndTime, start, end)));
         List<Meeting> meetings = meetingService.list(meetingQuery);