Explorar el Código

Merge branch 'master' into zz12356

zhoufan hace 7 meses
padre
commit
ab0746bb94

+ 2 - 2
midware-service/src/main/java/midware/service/eslclient/EslEventListenerEvent.java

@@ -443,8 +443,8 @@ public class EslEventListenerEvent implements IEslEventListener {
443 443
                             if (EslCommon.channels.stream().noneMatch(p -> p.getSessionId().equals(sid))) {
444 444
                                 EslCommon.sessions.remove(session);
445 445
                             }
446
-                            //会议剩下最后一个时挂机
447
-                            if (session.isMeeting()) {
446
+                            //未接通或会议剩下最后一个时挂机
447
+                            if (!session.isAnswer()&&session.isMeeting()) {
448 448
                                 if (EslCommon.channels.stream().filter(p -> p.getSessionId().equals(sid)).count() == 1) {
449 449
                                     Channel last = EslCommon.channels.stream().filter(p -> p.getSessionId().equals(sid)).findFirst().get();
450 450
                                     eslClientService.kill(last.getChanId(), "");