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 17:37:53 +03:30
parent 8d5d083883
commit 364c556790
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.Any(a => a.ExperID == ExperID) && w.Status == status)
.Where(w => w.ConversationResponses.OrderBy(o => o.ID).Last().ExperID == ExperID && w.Status == status)
.Select(s => new ChatItemDto()
{
ID = s.ID,
@@ -119,6 +119,7 @@ namespace Hushian.Application.Services
.Include(inc => inc.Group)
.Include(inc => inc.ConversationResponses).ThenInclude(tinc => tinc.Exper)
.Where(w => w.Status == ConversationStatus.Recorded && w.CompanyID == CompanyID);
if (groupallow != null) request = request.Where(w => !w.GroupID.HasValue || groupallow.Contains(w.GroupID.Value));
return await request.Select(s => new ChatItemDto()
{
@@ -275,7 +276,7 @@ namespace Hushian.Application.Services
};
Response.Success = statuschangedb.ID > 0;
if (convModel.Status == ConversationStatus.Recorded && Response.Success)
if (dto.Type != ConversationType.UE && convModel.Status == ConversationStatus.Recorded && Response.Success)
{
convModel.Status = ConversationStatus.InProgress;
await _ConversationRepository.UPDATE(convModel);

2
Hushian.Application/Services/ExperService.cs
View File

@@ -72,7 +72,7 @@ namespace Hushian.Application.Services
{
return await _ExperRepository.Get().Where(w => w.ID == ExperID).Select(s => new CurrentUserInfo
{
CompanyID = CompanyID,
CompanyID = s.CompanyID,
ExperID = ExperID,
Username = s.UserName,
Role = "Exper"