From e964cb551e4ea4548bef00bbcf69b6079065c88d Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Fri, 22 Aug 2025 18:29:01 +0330 Subject: [PATCH] ... --- Hushian.Application/Services/ChatService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hushian.Application/Services/ChatService.cs b/Hushian.Application/Services/ChatService.cs index ca82f75..47f5ea2 100644 --- a/Hushian.Application/Services/ChatService.cs +++ b/Hushian.Application/Services/ChatService.cs @@ -42,7 +42,7 @@ namespace Hushian.Application.Services => await _ConversationRepository.Get() .Include(inc => inc.Group) .Include(inc => inc.ConversationResponses).ThenInclude(tinc => tinc.Exper) - .Where(w => w.ConversationResponses.OrderBy(o => o.ID).Last().ExperID == ExperID && w.Status == status) + .Where(w => w.ConversationResponses.Any(a => a.ExperID == ExperID) && w.Status == status) .Select(s => new ChatItemDto() { ID = s.ID, @@ -286,19 +286,19 @@ namespace Hushian.Application.Services else { var modelA = convModel.ConversationResponses.OrderBy(o => o.ID) - .LastOrDefault(l => l.Type == ConversationType.EU || l.Type == ConversationType.CU); + .LastOrDefault(l =>/* l.Type == ConversationType.EU || l.Type == ConversationType.CU*/ l.ExperID.HasValue); if (modelA != null) { string user =""; - if (modelA.Type == ConversationType.EU) user = modelA.ExperID.Value.ToString(); + if (modelA.Type == ConversationType.EU || modelA.Type == ConversationType.UE) user = modelA.ExperID.Value.ToString(); else if (modelA.Type == ConversationType.CU) user ="C"+ modelA.conversation.CompanyID.ToString(); await WriteInHubFromUser(Response.Value, user); } - + else await NewChatInHub(convModel.CompanyID); } }