😁1、修改实体基类-增加操作者名称和机构名称 2、升级SqlSugar依赖

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -37,7 +37,7 @@
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.34.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.20.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.110" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.112" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

Admin.NET/Admin.NET.Core/Entity/EntityBase.cs

@@ -45,12 +45,36 @@ public abstract class EntityBase : EntityBaseId, IDeletedFilter
     public virtual long? CreateUserId { get; set; }
 
     /// <summary>
+    /// 创建者
+    /// </summary>
+    [Navigate(NavigateType.OneToOne, nameof(CreateUserId))]
+    public virtual SysUser CreateUser { get; set; }
+
+    /// <summary>
+    /// 创建者姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建者姓名", Length = 64, IsOnlyIgnoreUpdate = true)]
+    public virtual string? CreateUserName { get; set; }
+
+    /// <summary>
     /// 修改者Id
     /// </summary>
     [SugarColumn(ColumnDescription = "修改者Id", IsOnlyIgnoreInsert = true)]
     public virtual long? UpdateUserId { get; set; }
 
     /// <summary>
+    /// 修改者
+    /// </summary>
+    [Navigate(NavigateType.OneToOne, nameof(UpdateUserId))]
+    public virtual SysUser UpdateUser { get; set; }
+
+    /// <summary>
+    /// 修改者姓名
+    /// </summary>
+    [SugarColumn(ColumnDescription = "修改者姓名", Length = 64, IsOnlyIgnoreInsert = true)]
+    public virtual string? UpdateUserName { get; set; }
+
+    /// <summary>
     /// 软删除
     /// </summary>
     [SugarColumn(ColumnDescription = "软删除")]
@@ -73,6 +97,12 @@ public abstract class EntityBaseData : EntityBase, IOrgIdFilter
     /// </summary>
     [Navigate(NavigateType.OneToOne, nameof(CreateOrgId))]
     public virtual SysOrg CreateOrg { get; set; }
+
+    /// <summary>
+    /// 创建者部门名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "创建者部门名称", Length = 64, IsOnlyIgnoreUpdate = true)]
+    public virtual string? CreateOrgName { get; set; }
 }
 
 /// <summary>

Admin.NET/Admin.NET.Core/Enum/GenderEnum.cs

@@ -26,4 +26,10 @@ public enum GenderEnum
     /// </summary>
     [Description("女")]
     Female = 2,
+
+    /// <summary>
+    /// 其他
+    /// </summary>
+    [Description("其他")]
+    Other = 3
 }

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -181,14 +181,19 @@ public static class SqlSugarSetup
                         if (tenantId == null || tenantId == 0)
                             entityInfo.SetValue(App.User.FindFirst(ClaimConst.TenantId)?.Value);
                     }
-                    if (entityInfo.PropertyName == "CreateUserId")
+                    else if (entityInfo.PropertyName == "CreateUserId")
                     {
                         var createUserId = ((dynamic)entityInfo.EntityValue).CreateUserId;
                         if (createUserId == 0 || createUserId == null)
                             entityInfo.SetValue(App.User.FindFirst(ClaimConst.UserId)?.Value);
                     }
-
-                    if (entityInfo.PropertyName == "CreateOrgId")
+                    else if (entityInfo.PropertyName == "CreateUserName")
+                    {
+                        var createUserName = ((dynamic)entityInfo.EntityValue).CreateUserName;
+                        if (string.IsNullOrEmpty(createUserName))
+                            entityInfo.SetValue(App.User.FindFirst(ClaimConst.RealName)?.Value);
+                    }
+                    else if (entityInfo.PropertyName == "CreateOrgId")
                     {
                         var createOrgId = ((dynamic)entityInfo.EntityValue).CreateOrgId;
                         if (createOrgId == 0 || createOrgId == null)
@@ -200,8 +205,10 @@ public static class SqlSugarSetup
             {
                 if (entityInfo.PropertyName == "UpdateTime")
                     entityInfo.SetValue(DateTime.Now);
-                if (entityInfo.PropertyName == "UpdateUserId")
+                else if (entityInfo.PropertyName == "UpdateUserId")
                     entityInfo.SetValue(App.User?.FindFirst(ClaimConst.UserId)?.Value);
+                else if (entityInfo.PropertyName == "UpdateUserName")
+                    entityInfo.SetValue(App.User.FindFirst(ClaimConst.RealName)?.Value);
             }
         };