Преглед на файлове

Merge branch 'master' into zz12356

zhoufan преди 7 месеца
родител
ревизия
18ee6b8c8f
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      midware-service/src/main/java/midware/service/eslclient/EslEventListenerEvent.java

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

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