fix rebase错误

This commit is contained in:
2024-03-29 10:45:01 +08:00
parent 8b4f70bd7f
commit 5d3202724d

View File

@@ -1,6 +1,4 @@
using System.Security.Claims;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Sys.Entities;
using Dlhis.Entity.Sys.Entities;
using Dlhis.Sys.Identity.Request;
using Dlhis.Sys.Identity.Response;
using Kurisu.AspNetCore.Utils.Extensions;
@@ -14,12 +12,10 @@ namespace Dlhis.Sys.Identity.Services.Implements;
public class UserService : IUserService
{
private readonly IDbContext _dbContext;
private readonly IDbContext _dbContext1;
public UserService(IDbContext dbContext)
{
_dbContext = dbContext.ChangeDb("identity");
_dbContext1 = dbContext1;
}
public async Task<Pagination<UserResponse>> GetPageAsync(UserPageRequest request)
@@ -42,16 +38,6 @@ public class UserService : IUserService
}, true)
.ToPageListAsync(request);
var gainfos = await _dbContext1.ChangeDb("default").Queryable<GainfoEntity>()
.Where(x => x.IdentityUserId > 0)
.ToListAsync();
page.Data.ForEach(item =>
{
item.GainfoName = gainfos.Where(x => x.IdentityUserId == item.Id)
.FirstOrDefault()?.Name;
});
return page;
}