From 411d593ae6187577a69b2afe426e17e95eb0e243 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Sat, 15 Jun 2024 17:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hz/pm/api/meeting/task/ExpertRandomInviteTask.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/task/ExpertRandomInviteTask.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/task/ExpertRandomInviteTask.java
index 5c91c80..a60fa10 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/task/ExpertRandomInviteTask.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/task/ExpertRandomInviteTask.java
@@ -305,11 +305,11 @@ public class ExpertRandomInviteTask {
         });
         if (notIgnoreCnt.get() == 0 || notIgnoreCnt.get() == notSupportCnt.get()) {
             log.info("停止会议随机邀请：{} 未完成抽取规则数量 {} 无可抽取专家规则数量 {}", meetingId, notIgnoreCnt, notSupportCnt);
+            cancelByMeetingIdAndKillTask(meetingId);
             if (notIgnoreCnt.get() == notSupportCnt.get() && notIgnoreCnt.get() > 0) {
                 // 当未完成抽取且无专家可抽取时
                 meetingNotifyHelper.sendInviteStopMsg(meeting.getCreateBy(), meetingId, meeting.getName());
             }
-            cancelByMeetingIdAndKillTask(meetingId);
         }
         // 所有抽取规则抽取人数满足 自动召开会议
         if (notIgnoreCnt.get() == 0 && notSupportCnt.get() == 0) {
@@ -335,7 +335,7 @@ public class ExpertRandomInviteTask {
         if (future != null) {
             INVITE_TASK_MAP.remove(meetingId);
             if (!future.isCancelled()) {
-                future.cancel(true);
+                future.cancel(false);
             }
         }
     }