Merge branch 'dev' of http://110.188.24.182:10023/Fengwo/hotline into dev

src/Hotline.Api/Controllers/AiController.cs

@@ -420,7 +420,7 @@ namespace Hotline.Api.Controllers
                         .FirstAsync(x => x.Id == request.Id,HttpContext.RequestAborted);
                     if (aiVisit != null && !string.IsNullOrEmpty(aiVisit.BatchUid))
                     {
-                        if (aiVisit.TaskState != EAiOrderVisitTaskState.NoStarted || aiVisit.TaskState != EAiOrderVisitTaskState.InProgress)
+                        if (aiVisit.TaskState != EAiOrderVisitTaskState.NoStarted && aiVisit.TaskState != EAiOrderVisitTaskState.InProgress)
                             throw UserFriendlyException.SameMessage("当前状态不能终止");
 
                         bool isOk = await _aiVisitService.ChangeStatusAsync(aiVisit.BatchUid, "stop", HttpContext.RequestAborted);
@@ -437,7 +437,7 @@ namespace Hotline.Api.Controllers
                        .FirstAsync(x => x.Id == request.Id);
                     if (callOut != null && !string.IsNullOrEmpty(callOut.BatchUid))
                     {
-                        if (callOut.AiCallOutTaskState != EAiCallOutTaskState.NoStarted || callOut.AiCallOutTaskState != EAiCallOutTaskState.InProgress)
+                        if (callOut.AiCallOutTaskState != EAiCallOutTaskState.NoStarted && callOut.AiCallOutTaskState != EAiCallOutTaskState.InProgress)
                             throw UserFriendlyException.SameMessage("当前状态不能终止");
 
                         bool isOk = await _aiVisitService.ChangeStatusAsync(callOut.BatchUid, "stop", HttpContext.RequestAborted);