From 1f1be3102da7e5fa659d884777720561a7e5d12f Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Wed, 27 Mar 2024 14:22:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8F=96=E6=B6=88=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Sys/Identity/Response/UserResponse.cs  |  5 -----
 .../Identity/Services/Implements/UserService.cs  | 16 +---------------
 Src/Dlhis.Sys/SqlSugarPack.cs                    | 14 --------------
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/Src/Dlhis.Sys/Identity/Response/UserResponse.cs b/Src/Dlhis.Sys/Identity/Response/UserResponse.cs
index f152ac30..15c1fe33 100644
--- a/Src/Dlhis.Sys/Identity/Response/UserResponse.cs
+++ b/Src/Dlhis.Sys/Identity/Response/UserResponse.cs
@@ -9,11 +9,6 @@ public class UserResponse
     /// </summary>
     public string UserName { get; set; }
 
-    /// <summary>
-    /// 操作员名称
-    /// </summary>
-    public string GainfoName { get; set; }
-
     /// <summary>
     /// 规范化账号名称
     /// </summary>
diff --git a/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs b/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs
index e4f3f747..36876a16 100644
--- a/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs
+++ b/Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs
@@ -14,17 +14,15 @@ namespace Dlhis.Sys.Identity.Services.Implements;
 public class UserService : IUserService
 {
     private readonly IDbContext _dbContext;
-    private readonly IDbContext _dbContext1;
 
     public UserService(IDbContext dbContext, IDbContext dbContext1)
     {
         _dbContext = dbContext.ChangeDb("identity");
-        _dbContext1 = dbContext1;
     }
 
     public async Task<Pagination<UserResponse>> GetPageAsync(UserPageRequest request)
     {
-        var page = await _dbContext.Queryable<UserEntity>()
+        return await _dbContext.Queryable<UserEntity>()
             .LeftJoin<UserRoleEntity>((x, ur) => x.Id == ur.UserId)
             .LeftJoin<RoleEntity>((x, ur, r) => ur.RoleId == r.Id)
             .WhereIF(request.Search.IsPresent(), x => x.UserName.Contains(request.Search)
@@ -39,18 +37,6 @@ public class UserService : IUserService
                 Role = r.Name
             }, 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;
     }
 
     public async Task ResetAccessFailedCountAsync(int id)
diff --git a/Src/Dlhis.Sys/SqlSugarPack.cs b/Src/Dlhis.Sys/SqlSugarPack.cs
index b71cf8f5..98f4153a 100644
--- a/Src/Dlhis.Sys/SqlSugarPack.cs
+++ b/Src/Dlhis.Sys/SqlSugarPack.cs
@@ -25,20 +25,6 @@ public class SqlSugarPack : BaseAppPack
                     InitKeyType = InitKeyType.Attribute,
                     IsAutoCloseConnection = true,
 
-                    MoreSettings = new ConnMoreSettings
-                    {
-                        DisableNvarchar = true,
-                    }
-                 },
-                 new()
-                 {
-                    ConfigId = "default",
-
-                    ConnectionString = configuration.GetSection("SqlSugarOptions:DefaultConnectionString").Value,
-                    DbType = DbType.MySql,
-                    InitKeyType = InitKeyType.Attribute,
-                    IsAutoCloseConnection = true,
-
                     MoreSettings = new ConnMoreSettings
                     {
                         DisableNvarchar = true,