From 3b5bd20b54022e21b56f1f98903b10ef1797a326 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 25 Jun 2024 11:43:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=98=BE=E7=A4=BA=E9=9D=9Esap=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs b/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs index 0934ad06..8fc1116f 100644 --- a/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs +++ b/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs @@ -31,6 +31,7 @@ public class UserService : IUserService { var tenant = _currentUser.GetStringTenantId(); var userCodes = await _dbContext.Queryable().Where(x => x.Factory == tenant).Select(x => x.Code).ToListAsync(); + var userIds = await _dbContext.Queryable().Where(x => x.TenantCode == tenant).Select(x => x.UserId).Distinct().ToListAsync(); var page = await _identityDbContext.Queryable() .LeftJoin((x, ur) => x.Id == ur.UserId) @@ -44,7 +45,7 @@ public class UserService : IUserService || x.PhoneNumber == request.Search || c.ClaimValue == request.Search ) - .Where(x => userCodes.Contains(x.UserName)) + .Where(x => userIds.Contains(x.Id) || userCodes.Contains(x.UserName)) .Select((x, ur, r, c) => new UserResponse { Id = x.Id,