...
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user