yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 显示非sap员工数据

Browse Source
This commit is contained in:
liguoyang
2024-06-25 11:43:50 +08:00
parent 8ddbd88636
commit 3b5bd20b54
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs
View File

@@ -31,6 +31,7 @@ public class UserService : IUserService
{ {
var tenant = _currentUser.GetStringTenantId(); var tenant = _currentUser.GetStringTenantId();
var userCodes = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Factory == tenant).Select(x => x.Code).ToListAsync(); var userCodes = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Factory == tenant).Select(x => x.Code).ToListAsync();
var userIds = await _dbContext.Queryable<UserTenantEntity>().Where(x => x.TenantCode == tenant).Select(x => x.UserId).Distinct().ToListAsync();
var page = await _identityDbContext.Queryable<UserEntity>() var page = await _identityDbContext.Queryable<UserEntity>()
.LeftJoin<UserRoleEntity>((x, ur) => x.Id == ur.UserId) .LeftJoin<UserRoleEntity>((x, ur) => x.Id == ur.UserId)
@@ -44,7 +45,7 @@ public class UserService : IUserService
|| x.PhoneNumber == request.Search || x.PhoneNumber == request.Search
|| c.ClaimValue == 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 .Select((x, ur, r, c) => new UserResponse
{ {
Id = x.Id, Id = x.Id,