Merge branch 'master' into zyyt

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

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