mmr/Hushian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
mmrbnjd
2025-08-22 18:29:01 +03:30
parent 364c556790
commit e964cb551e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Hushian.Application/Services/ChatService.cs
View File

@@ -42,7 +42,7 @@ namespace Hushian.Application.Services
=> await _ConversationRepository.Get() => await _ConversationRepository.Get()
.Include(inc => inc.Group) .Include(inc => inc.Group)
.Include(inc => inc.ConversationResponses).ThenInclude(tinc => tinc.Exper) .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() .Select(s => new ChatItemDto()
{ {
ID = s.ID, ID = s.ID,
@@ -286,19 +286,19 @@ namespace Hushian.Application.Services
else else
{ {
var modelA = convModel.ConversationResponses.OrderBy(o => o.ID) 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) if (modelA != null)
{ {
string user =""; 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(); else if (modelA.Type == ConversationType.CU) user ="C"+ modelA.conversation.CompanyID.ToString();
await WriteInHubFromUser(Response.Value, user); await WriteInHubFromUser(Response.Value, user);
} }
else await NewChatInHub(convModel.CompanyID);
} }
} }