fix ： Handling the issue of operator name not displaying

masastack · Jul 14, 2023 · 1da282f · 1da282f
1 parent bcd4325
commit 1da282f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/Services/Masa.Mc.Service/Application/Channels/ChannelQueryHandler.cs b/src/Services/Masa.Mc.Service/Application/Channels/ChannelQueryHandler.cs
@@ -78,7 +78,8 @@ private async Task FillChannelDtos(List<ChannelDto> dtos)
         var userInfos = await _authClient.UserService.GetListByIdsAsync(modifierUserIds);
         foreach (var item in dtos)
         {
-            item.ModifierName = userInfos.FirstOrDefault(x => x.Id == item.Modifier)?.StaffDisplayName ?? string.Empty;
+            var modifier = userInfos.FirstOrDefault(x => x.Id == item.Modifier);
+            item.ModifierName = modifier?.StaffDisplayName ?? modifier?.DisplayName ?? string.Empty;
         }
     }
 }
diff --git a/src/Services/Masa.Mc.Service/Application/MessageTasks/MessageTaskQueryHandler.cs b/src/Services/Masa.Mc.Service/Application/MessageTasks/MessageTaskQueryHandler.cs
@@ -202,7 +202,8 @@ private async Task FillMessageTaskListDtos(List<MessageTaskDto> dtos)
                 item.Content = HtmlHelper.CutString(messageContent, 500);
             }
 
-            item.ModifierName = userInfos.FirstOrDefault(x => x.Id == item.Modifier)?.StaffDisplayName ?? string.Empty;
+            var modifier = userInfos.FirstOrDefault(x => x.Id == item.Modifier);
+            item.ModifierName = modifier?.StaffDisplayName ?? modifier?.DisplayName ?? string.Empty;
         }
     }
 

diff --git a/src/Services/Masa.Mc.Service/Application/MessageTemplates/MessageTemplateQueryHandler.cs b/src/Services/Masa.Mc.Service/Application/MessageTemplates/MessageTemplateQueryHandler.cs
@@ -72,7 +72,8 @@ private async Task FillMessageTemplateDtos(List<MessageTemplateDto> dtos)
         var userInfos = await _authClient.UserService.GetListByIdsAsync(modifierUserIds);
         foreach (var item in dtos)
         {
-            item.ModifierName = userInfos.FirstOrDefault(x => x.Id == item.Modifier)?.StaffDisplayName ?? string.Empty;
+            var modifier = userInfos.FirstOrDefault(x => x.Id == item.Modifier);
+            item.ModifierName = modifier?.StaffDisplayName ?? modifier?.DisplayName ?? string.Empty;
         }
     }
 }
diff --git a/src/Services/Masa.Mc.Service/Application/ReceiverGroups/ReceiverGroupQueryHandler.cs b/src/Services/Masa.Mc.Service/Application/ReceiverGroups/ReceiverGroupQueryHandler.cs
@@ -60,7 +60,8 @@ private async Task FillReceiverGroupDtos(List<ReceiverGroupDto> dtos)
         var userInfos = await _authClient.UserService.GetListByIdsAsync(modifierUserIds);
         foreach (var item in dtos)
         {
-            item.ModifierName = userInfos.FirstOrDefault(x => x.Id == item.Modifier)?.StaffDisplayName ?? string.Empty;
+            var modifier = userInfos.FirstOrDefault(x => x.Id == item.Modifier);
+            item.ModifierName = modifier?.StaffDisplayName ?? modifier?.DisplayName ?? string.Empty;
         }
     }
 }