Parcourir la source

Merge branch 'release' of http://git.12345lm.cn/Fengwo/hotline into release

qinchaoyue il y a 7 mois
Parent
commit
65b962354b

+ 1 - 1
src/Hotline.Api/Controllers/AiController.cs

@@ -674,7 +674,7 @@ namespace Hotline.Api.Controllers
                                     x.VisitContent = visitContent;
                                     x.Volved = isSolve;
                                     x.IsContact = isContact;
-                                    if (string.IsNullOrEmpty(orgProcessingResults.Key) || seatEvaluate == null || isSolve == null || isContact == null ||  orgProcessingResults.Value == "不满意" || seatEvaluate== ESeatEvaluate.NoSatisfied)
+                                    if (string.IsNullOrEmpty(orgProcessingResults?.Key) || seatEvaluate == null || isSolve == null || isContact == null ||  orgProcessingResults?.Value == "不满意" || seatEvaluate== ESeatEvaluate.NoSatisfied)
                                     {
                                         //x.OrgNoSatisfiedReason = new List<Kv>() { new Kv() { Key = "7", Value = "未回复" } };
                                         //TODO 记录不满意原因到内容中供人工回访甄别选择不满意原因

+ 7 - 1
src/Hotline.Api/Controllers/Bigscreen/SeatController.cs

@@ -50,10 +50,16 @@ namespace Hotline.Api.Controllers.Bigscreen
         public async Task<List<TelOutDto>> GetListenTels()
         {
             var listenTels = _systemSettingCacheManager.GetSetting(SettingConstants.ListenTels)?.SettingValue;
-            return (await _trClient.QueryTelsAsync(new QueryTelRequest(), HttpContext.RequestAborted))
+            var callOuttQueueId = _systemSettingCacheManager.GetSetting(SettingConstants.CallOutQueueId)?.SettingValue;
+            var list = (await _trClient.QueryTelsAsync(new QueryTelRequest(), HttpContext.RequestAborted))
                 .Where(m => listenTels.Contains(m.TelNo))
                 .ToList()
                 .Adapt<List<TelOutDto>>();
+            list.ForEach(x =>
+            {
+                x.Queue = callOuttQueueId[0];
+            });
+            return list;
         }
     }
 }