From 931c738f068cb04cb8052ba32a19a6fb0f17bba4 Mon Sep 17 00:00:00 2001 From: YouWeiDH Date: Tue, 21 Jan 2025 14:52:03 +0800 Subject: [PATCH] Fix userName can't login in email type. --- .../Repository/FileRepository/FileRepository.User.cs | 4 +++- .../Repository/MongoRepository.User.cs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs index 8dfd198d..7e3592f3 100644 --- a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs +++ b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs @@ -172,7 +172,9 @@ public partial class FileRepository searchResult.Add(user); } } - else if (!string.IsNullOrWhiteSpace(filter.UserName)) + + + if (searchResult.Count == 0 && !string.IsNullOrWhiteSpace(filter.UserName)) { var curUser = Users.AsQueryable().FirstOrDefault(x => x.Source == source && x.UserName == filter.UserName); User user = curUser != null ? curUser : null; diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs index 9ca34c97..95fbf17b 100644 --- a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs +++ b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs @@ -289,7 +289,9 @@ public partial class MongoRepository searchResult.Add(user); } } - else if (!string.IsNullOrWhiteSpace(filter.UserName)) + + + if (searchResult.Count == 0 && !string.IsNullOrWhiteSpace(filter.UserName)) { var curUser = _dc.Users.AsQueryable().FirstOrDefault(x => x.Source == source && x.UserName == filter.UserName); User user = curUser != null ? curUser.ToUser() : null;