新增数据权限过滤器

src/hosts/ZhonTai.Host/InitData/Admin/ad_user.json

@@ -5,7 +5,7 @@
     "password": "96E79218965EB72C92A549DD5A330112",
     "name": "管理员",
     "mobile": "13122223333",
-    "mainOrgId": 189097691009093,
+    "orgId": 189097691009093,
     "nickName": "小雪",
     "type": 100
   }

src/hosts/ZhonTai.Host/InitData/Admin/ad_user.tenant.json

@@ -6,7 +6,7 @@
     "password": "96E79218965EB72C92A549DD5A330112",
     "name": "管理员",
     "mobile": "13122223333",
-    "mainOrgId": 189097691009093,
+    "orgId": 189097691009093,
     "nickName": "小雪",
     "type": 100
   }

src/platform/ZhonTai.Admin/Core/Auth/IUser.cs

@@ -49,6 +49,11 @@ public interface IUser
     /// </summary>
     long? TenantId { get; }
 
+    /// <summary>
+    /// 部门Id
+    /// </summary>
+    long? OrgId { get; }
+
     /// <summary>
     /// 租户类型
     /// </summary>

src/platform/ZhonTai.Admin/Core/Auth/User.cs

@@ -3,7 +3,6 @@ using System;
 using ZhonTai.Common.Extensions;
 using ZhonTai.Admin.Core.Entities;
 using ZhonTai.Admin.Domain.User;
-using System.Xml.Linq;
 
 namespace ZhonTai.Admin.Core.Auth;
 
@@ -87,6 +86,17 @@ public class User : IUser
         }
     }
 
+    /// <summary>
+    /// 部门Id
+    /// </summary>
+    public virtual long? OrgId
+    {
+        get
+        {
+            return null;
+        }
+    }
+
     /// <summary>
     /// 用户类型
     /// </summary>

src/platform/ZhonTai.Admin/Core/Consts/FilterNames.cs

@@ -8,14 +8,26 @@ namespace ZhonTai.Admin.Core.Consts;
 public static partial class FilterNames
 {
     /// <summary>
-    /// 软删除
+    /// 删除
     /// </summary>
-    [Description("软删除")]
-    public const string SoftDelete = "SoftDelete";
+    [Description("删除")]
+    public const string Delete = "Delete";
 
     /// <summary>
     /// 租户
     /// </summary>
     [Description("租户")]
     public const string Tenant = "Tenant";
+
+    /// <summary>
+    /// 本人
+    /// </summary>
+    [Description("本人")]
+    public const string Self = "Self";
+
+    /// <summary>
+    /// 部门
+    /// </summary>
+    [Description("部门")]
+    public const string Org = "Org";
 }

src/platform/ZhonTai.Admin/Core/Db/DBServiceCollectionExtensions.cs

@@ -73,7 +73,7 @@ public static class DBServiceCollectionExtensions
             var user = services.BuildServiceProvider().GetService<IUser>();
 
             //软删除过滤器
-            fsql.GlobalFilter.Apply<ISoftDelete>(FilterNames.SoftDelete, a => a.IsDeleted == false);
+            fsql.GlobalFilter.Apply<IDelete>(FilterNames.Delete, a => a.IsDeleted == false);
 
             //配置实体
             DbHelper.ConfigEntity(fsql, appConfig);
@@ -145,6 +145,9 @@ public static class DBServiceCollectionExtensions
                 fsql.GlobalFilter.Apply<ITenant>(FilterNames.Tenant, a => a.TenantId == user.TenantId);
             }
 
+            //部门过滤器
+            //fsql.GlobalFilter.Apply<IOrg>(FilterNames.Org, a => a.CreatedOrgId);
+
             return fsql;
         });
 

src/platform/ZhonTai.Admin/Core/Db/DbHelper.cs

@@ -167,13 +167,19 @@ public class DbHelper
                         e.Value = user.UserName;
                     }
                     break;
-
+                case "CreatedOrgId":
+                    if (e.Value == null || (long)e.Value == default || (long?)e.Value == default)
+                    {
+                        e.Value = user.OrgId;
+                    }
+                    break;
                 case "TenantId":
                     if (e.Value == null || (long)e.Value == default || (long?)e.Value == default)
                     {
                         e.Value = user.TenantId;
                     }
                     break;
+
             }
         }
         else if (e.AuditValueType == AuditValueType.Update)

src/platform/ZhonTai.Admin/Core/Db/FreeSqlCloudExtesions.cs

@@ -44,7 +44,7 @@ public static class FreeSqlCloudExtesions
         #endregion 监听所有命令
 
         var fsql = freeSqlBuilder.Build();
-        fsql.GlobalFilter.Apply<ISoftDelete>(FilterNames.SoftDelete, a => a.IsDeleted == false);
+        fsql.GlobalFilter.Apply<IDelete>(FilterNames.Delete, a => a.IsDeleted == false);
 
         //配置实体
         DbHelper.ConfigEntity(fsql, appConfig);

src/platform/ZhonTai.Admin/Core/Entities/EntityAdd.cs

@@ -14,24 +14,27 @@ public class EntityAdd<TKey> : Entity<TKey>, IEntityAdd<TKey> where TKey : struc
     /// 创建者Id
     /// </summary>
     [Description("创建者Id")]
-    [Column(Position = -3, CanUpdate = false)]
+    [Column(Position = -22, CanUpdate = false)]
     public long? CreatedUserId { get; set; }
 
     /// <summary>
     /// 创建者
     /// </summary>
     [Description("创建者")]
-    [Column(Position = -2, CanUpdate = false), MaxLength(50)]
+    [Column(Position = -21, CanUpdate = false), MaxLength(50)]
     public string CreatedUserName { get; set; }
 
     /// <summary>
     /// 创建时间
     /// </summary>
     [Description("创建时间")]
-    [Column(Position = -1, CanUpdate = false, ServerTime = DateTimeKind.Local)]
+    [Column(Position = -20, CanUpdate = false, ServerTime = DateTimeKind.Local)]
     public DateTime? CreatedTime { get; set; }
 }
 
+/// <summary>
+/// 实体创建
+/// </summary>
 public class EntityAdd : EntityAdd<long>
 {
 }

src/platform/ZhonTai.Admin/Core/Entities/EntityFull.cs → src/platform/ZhonTai.Admin/Core/Entities/EntityBase.cs

@@ -6,70 +6,70 @@ using System.ComponentModel.DataAnnotations;
 namespace ZhonTai.Admin.Core.Entities;
 
 /// <summary>
-/// 实体完整类
+/// 实体基类
 /// </summary>
-public class EntityFull<TKey> : Entity<TKey>, IVersion, ISoftDelete, IEntityAdd<TKey>, IEntityUpdate<TKey> where TKey : struct
+public class EntityBase<TKey> : Entity<TKey>, IVersion, IDelete, IEntityAdd<TKey>, IEntityUpdate<TKey> where TKey : struct
 {
-    /// <summary>
-    /// 版本
-    /// </summary>
-    [Description("版本")]
-    [Column(Position = -9, IsVersion = true)]
-    public long Version { get; set; }
-
     /// <summary>
     /// 是否删除
     /// </summary>
     [Description("是否删除")]
-    [Column(Position = -8)]
+    [Column(Position = -40)]
     public bool IsDeleted { get; set; } = false;
 
+    /// <summary>
+    /// 版本
+    /// </summary>
+    [Description("版本")]
+    [Column(Position = -30, IsVersion = true)]
+    public long Version { get; set; }
+
     /// <summary>
     /// 创建者Id
     /// </summary>
     [Description("创建者Id")]
-    [Column(Position = -7, CanUpdate = false)]
+    [Column(Position = -22, CanUpdate = false)]
     public long? CreatedUserId { get; set; }
 
     /// <summary>
     /// 创建者
     /// </summary>
     [Description("创建者")]
-    [Column(Position = -6, CanUpdate = false), MaxLength(50)]
+    [Column(Position = -21, CanUpdate = false), MaxLength(50)]
     public string CreatedUserName { get; set; }
 
     /// <summary>
     /// 创建时间
     /// </summary>
     [Description("创建时间")]
-    [Column(Position = -5, CanUpdate = false, ServerTime = DateTimeKind.Local)]
+    [Column(Position = -20, CanUpdate = false, ServerTime = DateTimeKind.Local)]
     public DateTime? CreatedTime { get; set; }
 
     /// <summary>
     /// 修改者Id
     /// </summary>
     [Description("修改者Id")]
-    [Column(Position = -4, CanInsert = false)]
+    [Column(Position = -12, CanInsert = false)]
     public long? ModifiedUserId { get; set; }
 
     /// <summary>
     /// 修改者
     /// </summary>
     [Description("修改者")]
-    [Column(Position = -2, CanInsert = false), MaxLength(50)]
+    [Column(Position = -11, CanInsert = false), MaxLength(50)]
     public string ModifiedUserName { get; set; }
 
     /// <summary>
     /// 修改时间
     /// </summary>
     [Description("修改时间")]
-    [Column(Position = -1, CanInsert = false, ServerTime = DateTimeKind.Local)]
+    [Column(Position = -10, CanInsert = false, ServerTime = DateTimeKind.Local)]
     public DateTime? ModifiedTime { get; set; }
 }
 
 /// <summary>
-/// 实体完整类
+/// 实体基类
 /// </summary>
-public class EntityFull : EntityFull<long>
+public class EntityBase : EntityBase<long>
 {
 }

src/platform/ZhonTai.Admin/Core/Entities/EntitySoftDelete.cs → src/platform/ZhonTai.Admin/Core/Entities/EntityDelete.cs

@@ -6,16 +6,19 @@ namespace ZhonTai.Admin.Core.Entities;
 /// <summary>
 /// 实体软删除
 /// </summary>
-public class EntitySoftDelete<TKey> : Entity<TKey>, ISoftDelete
+public class EntityDelete<TKey> : Entity<TKey>, IDelete
 {
     /// <summary>
     /// 是否删除
     /// </summary>
     [Description("是否删除")]
-    [Column(Position = -1)]
+    [Column(Position = -40)]
     public bool IsDeleted { get; set; } = false;
 }
 
-public class EntitySoftDelete : EntitySoftDelete<long>
+/// <summary>
+/// 实体软删除
+/// </summary>
+public class EntityDelete : EntityDelete<long>
 {
 }

src/platform/ZhonTai.Admin/Core/Entities/EntityUpdate.cs

@@ -14,24 +14,27 @@ public class EntityUpdate<TKey> : Entity<TKey>, IEntityUpdate<TKey> where TKey :
     /// 修改者Id
     /// </summary>
     [Description("修改者Id")]
-    [Column(Position = -3, CanInsert = false)]
+    [Column(Position = -12, CanInsert = false)]
     public long? ModifiedUserId { get; set; }
 
     /// <summary>
     /// 修改者
     /// </summary>
     [Description("修改者")]
-    [Column(Position = -2, CanInsert = false), MaxLength(50)]
+    [Column(Position = -11, CanInsert = false), MaxLength(50)]
     public string ModifiedUserName { get; set; }
 
     /// <summary>
     /// 修改时间
     /// </summary>
     [Description("修改时间")]
-    [Column(Position = -1, CanInsert = false, ServerTime = DateTimeKind.Local)]
+    [Column(Position = -10, CanInsert = false, ServerTime = DateTimeKind.Local)]
     public DateTime? ModifiedTime { get; set; }
 }
 
+/// <summary>
+/// 实体修改
+/// </summary>
 public class EntityUpdate : EntityUpdate<long>
 {
 }

src/platform/ZhonTai.Admin/Core/Entities/EntityVersion.cs

@@ -12,7 +12,7 @@ public class EntityVersion<TKey> : Entity<TKey>, IVersion
     /// 版本
     /// </summary>
     [Description("版本")]
-    [Column(Position = -1, IsVersion = true)]
+    [Column(Position = -30, IsVersion = true)]
     public long Version { get; set; }
 }
 

src/platform/ZhonTai.Admin/Core/Entities/ISoftDelete.cs → src/platform/ZhonTai.Admin/Core/Entities/IDelete.cs

@@ -1,6 +1,9 @@
 namespace ZhonTai.Admin.Core.Entities;
 
-public interface ISoftDelete
+/// <summary>
+/// 删除接口
+/// </summary>
+public interface IDelete
 {
     /// <summary>
     /// 是否删除

src/platform/ZhonTai.Admin/Core/Entities/IEntityAdd.cs

@@ -2,9 +2,22 @@
 
 namespace ZhonTai.Admin.Core.Entities;
 
+/// <summary>
+/// 添加接口
+/// </summary>
+/// <typeparam name="TKey"></typeparam>
 public interface IEntityAdd<TKey> where TKey : struct
 {
+    /// <summary>
+    /// 创建者用户Id
+    /// </summary>
     long? CreatedUserId { get; set; }
+    /// <summary>
+    /// 创建者
+    /// </summary>
     string CreatedUserName { get; set; }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
     DateTime? CreatedTime { get; set; }
 }

src/platform/ZhonTai.Admin/Core/Entities/IEntityUpdate.cs

@@ -2,9 +2,22 @@
 
 namespace ZhonTai.Admin.Core.Entities;
 
+/// <summary>
+/// 修改接口
+/// </summary>
+/// <typeparam name="TKey"></typeparam>
 public interface IEntityUpdate<TKey> where TKey : struct
 {
+    /// <summary>
+    /// 修改者Id
+    /// </summary>
     long? ModifiedUserId { get; set; }
+    /// <summary>
+    /// 修改者
+    /// </summary>
     string ModifiedUserName { get; set; }
+    /// <summary>
+    /// 修改时间
+    /// </summary>
     DateTime? ModifiedTime { get; set; }
 }

src/platform/ZhonTai.Admin/Core/Entities/IOrg.cs

@@ -0,0 +1,12 @@
+namespace ZhonTai.Admin.Core.Entities;
+
+/// <summary>
+/// 部门接口
+/// </summary>
+public interface IOrg
+{
+    /// <summary>
+    /// 创建者部门Id
+    /// </summary>
+    long? CreatedOrgId { get; set; }
+}

src/platform/ZhonTai.Admin/Core/Entities/ITenant.cs

@@ -1,5 +1,8 @@
 namespace ZhonTai.Admin.Core.Entities;
 
+/// <summary>
+/// 租户接口
+/// </summary>
 public interface ITenant
 {
     /// <summary>

src/platform/ZhonTai.Admin/Core/Entities/IVersion.cs

@@ -1,5 +1,8 @@
 namespace ZhonTai.Admin.Core.Entities;
 
+/// <summary>
+/// 版本接口
+/// </summary>
 public interface IVersion
 {
     /// <summary>

src/platform/ZhonTai.Admin/Domain/Api/ApiEntity.cs

@@ -12,7 +12,7 @@ namespace ZhonTai.Admin.Domain.Api;
 /// </summary>
 [Table(Name = "ad_api")]
 [Index("idx_{tablename}_01", nameof(Path), true)]
-public partial class ApiEntity : EntityFull
+public partial class ApiEntity : EntityBase
 {
     /// <summary>
     /// 所属模块

src/platform/ZhonTai.Admin/Domain/Dictionary/DictionaryEntity.cs

@@ -9,7 +9,7 @@ namespace ZhonTai.Admin.Domain.Dictionary;
 /// </summary>
 [Table(Name = "ad_dictionary")]
 [Index("idx_{tablename}_01", nameof(DictionaryTypeId) + "," + nameof(Name) + "," + nameof(TenantId), true)]
-public partial class DictionaryEntity : EntityFull, ITenant
+public partial class DictionaryEntity : EntityBase, ITenant
 {
     /// <summary>
     /// 租户Id

src/platform/ZhonTai.Admin/Domain/DictionaryType/DictionaryTypeEntity.cs

@@ -8,7 +8,7 @@ namespace ZhonTai.Admin.Domain.DictionaryType;
 /// </summary>
 [Table(Name = "ad_dictionary_type")]
 [Index("idx_{tablename}_01", nameof(Name) + "," + nameof(TenantId), true)]
-public class DictionaryTypeEntity : EntityFull, ITenant
+public class DictionaryTypeEntity : EntityBase, ITenant
 {
     /// <summary>
     /// 租户Id

src/platform/ZhonTai.Admin/Domain/Document/DocumentEntity.cs

@@ -8,7 +8,7 @@ namespace ZhonTai.Admin.Domain.Document;
 /// </summary>
 [Table(Name = "ad_document")]
 [Index("idx_{tablename}_01", nameof(ParentId) + "," + nameof(Label) + "," + nameof(TenantId), true)]
-public partial class DocumentEntity : EntityFull, ITenant
+public partial class DocumentEntity : EntityBase, ITenant
 {
     /// <summary>
     /// 租户Id

src/platform/ZhonTai.Admin/Domain/Org/OrgEntity.cs

@@ -12,7 +12,7 @@ namespace ZhonTai.Admin.Domain.Org;
 /// </summary>
 [Table(Name = "ad_org")]
 [Index("idx_{tablename}_01", nameof(ParentId) + "," + nameof(Name) + "," + nameof(TenantId), true)]
-public partial class OrgEntity : EntityFull, ITenant
+public partial class OrgEntity : EntityBase, ITenant
 {
     /// <summary>
     /// 租户Id

src/platform/ZhonTai.Admin/Domain/Permission/PermissionEntity.cs

@@ -12,7 +12,7 @@ namespace ZhonTai.Admin.Domain.Permission;
 /// </summary>
 [Table(Name = "ad_permission")]
 [Index("idx_{tablename}_01", nameof(ParentId) + "," + nameof(Label), true)]
-public partial class PermissionEntity : EntityFull
+public partial class PermissionEntity : EntityBase
 {
     /// <summary>
     /// 父级节点

src/platform/ZhonTai.Admin/Domain/Role/RoleEntity.cs

@@ -15,7 +15,7 @@ namespace ZhonTai.Admin.Domain.Role;
 /// </summary>
 [Table(Name = "ad_role")]
 [Index("idx_{tablename}_01", $"{nameof(TenantId)},{nameof(ParentId)},{nameof(Name)}", true)]
-public partial class RoleEntity : EntityFull, ITenant
+public partial class RoleEntity : EntityBase, ITenant
 {
     /// <summary>
     /// 租户Id

src/platform/ZhonTai.Admin/Domain/Staff/Input/StaffAddInput.cs

@@ -23,7 +23,7 @@ public class StaffAddInput
     /// <summary>
     /// 主属部门Id
     /// </summary>
-    public long MainOrgId { get; set; }
+    public long OrgId { get; set; }
 
     /// <summary>
     /// 所属部门

src/platform/ZhonTai.Admin/Domain/Staff/StaffEntity.cs

@@ -8,7 +8,7 @@ namespace ZhonTai.Admin.Domain.Staff;
 /// 员工
 /// </summary>
 [Table(Name = "ad_staff")]
-public partial class StaffEntity : EntityFull, ITenant
+public partial class StaffEntity : EntityBase, ITenant
 {
     /// <summary>
     /// 租户Id

src/platform/ZhonTai.Admin/Domain/Tenant/TenantEntity.cs

@@ -12,7 +12,7 @@ namespace ZhonTai.Admin.Domain.Tenant;
 [Table(Name = "ad_tenant")]
 [Index("idx_{tablename}_01", nameof(Name), true)]
 [Index("idx_{tablename}_02", nameof(Code), true)]
-public partial class TenantEntity : EntityFull
+public partial class TenantEntity : EntityBase
 {
     /// <summary>
     /// 企业名称

src/platform/ZhonTai.Admin/Domain/User/UserEntity.cs

@@ -15,7 +15,7 @@ namespace ZhonTai.Admin.Domain.User;
 /// </summary>
 [Table(Name = "ad_user")]
 [Index("idx_{tablename}_01", nameof(UserName) + "," + nameof(TenantId), true)]
-public partial class UserEntity : EntityFull, ITenant
+public partial class UserEntity : EntityBase, ITenant
 {
     /// <summary>
     /// 租户Id
@@ -58,7 +58,7 @@ public partial class UserEntity : EntityFull, ITenant
     /// <summary>
     /// 主属部门Id
     /// </summary>
-    public long MainOrgId { get; set; }
+    public long OrgId { get; set; }
 
     public OrgEntity MainOrg { get; set; }
 

src/platform/ZhonTai.Admin/Domain/View/ViewEntity.cs

@@ -10,7 +10,7 @@ namespace ZhonTai.Admin.Domain.View;
 /// </summary>
 [Table(Name = "ad_view")]
 [Index("idx_{tablename}_01", nameof(ParentId) + "," + nameof(Label), true)]
-public partial class ViewEntity : EntityFull
+public partial class ViewEntity : EntityBase
 {
     /// <summary>
     /// 所属节点

src/platform/ZhonTai.Admin/Services/Auth/Dto/AuthLoginOutput.cs

@@ -30,6 +30,11 @@ public class AuthLoginOutput
     /// </summary>
     public long? TenantId { get; set; }
 
+    /// <summary>
+    /// 部门Id
+    /// </summary>
+    public long? OrgId { get; set; }
+
     /// <summary>
     /// 租户类型
     /// </summary>

src/platform/ZhonTai.Admin/Services/Tenant/TenantService.cs

@@ -142,7 +142,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
             Email = input.Email,
             Status = UserStatus.Enabled,
             Type = UserType.TenantAdmin,
-            MainOrgId = org.Id
+            OrgId = org.Id
         };
         await tenantDb.GetRepositoryBase<UserEntity>().InsertAsync(user);
 
@@ -168,9 +168,9 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
         //添加角色分组
         var roleGroup = new RoleEntity
         {
+            ParentId = 0,
             TenantId = tenantId,
-            Name = "系统默认",
-            ParentId = 0
+            Name = "系统默认"
         };
         await roleRepository.InsertAsync(roleGroup);
 
@@ -180,7 +180,8 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
             TenantId = tenantId,
             Name = "主管理员",
             Code = "main-admin",
-            ParentId = roleGroup.Id
+            ParentId = roleGroup.Id,
+            DataScope = DataScope.All
         };
         await roleRepository.InsertAsync(role);
 

src/platform/ZhonTai.Admin/Services/User/Dto/UserAddInput.cs

@@ -53,7 +53,7 @@ public class UserAddInput
     /// <summary>
     /// 主属部门Id
     /// </summary>
-    public long MainOrgId { get; set; }
+    public long OrgId { get; set; }
 
     /// <summary>
     /// 状态

src/platform/ZhonTai.Admin/Services/User/Dto/UserUpdateInput.cs

@@ -59,7 +59,7 @@ public partial class UserUpdateInput
     /// <summary>
     /// 主属部门Id
     /// </summary>
-    public long MainOrgId { get; set; }
+    public long OrgId { get; set; }
 
     /// <summary>
     /// 状态

src/platform/ZhonTai.Admin/Services/User/UserService.cs

@@ -70,7 +70,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
             a.Email,
             a.Roles,
             a.Orgs,
-            a.MainOrgId,
+            a.OrgId,
             Staff = new
             {
                 a.Staff.JobNumber,

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -157,6 +157,11 @@
             租户Id
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Core.Auth.IUser.OrgId">
+            <summary>
+            部门Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Core.Auth.IUser.TenantType">
             <summary>
             租户类型
@@ -210,6 +215,11 @@
             租户Id
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Core.Auth.User.OrgId">
+            <summary>
+            部门Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Core.Auth.User.Type">
             <summary>
             用户类型
@@ -720,9 +730,9 @@
             全局过滤器名
             </summary>
         </member>
-        <member name="F:ZhonTai.Admin.Core.Consts.FilterNames.SoftDelete">
+        <member name="F:ZhonTai.Admin.Core.Consts.FilterNames.Delete">
             <summary>
-            软删除
+            删除
             </summary>
         </member>
         <member name="F:ZhonTai.Admin.Core.Consts.FilterNames.Tenant">
@@ -730,6 +740,16 @@
             租户
             </summary>
         </member>
+        <member name="F:ZhonTai.Admin.Core.Consts.FilterNames.Self">
+            <summary>
+            本人
+            </summary>
+        </member>
+        <member name="F:ZhonTai.Admin.Core.Consts.FilterNames.Org">
+            <summary>
+            部门
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Conventions.ApiGroupConvention">
             <summary>
             Api分组约定
@@ -1120,66 +1140,76 @@
             创建时间
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Core.Entities.EntityFull`1">
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityAdd">
             <summary>
-            实体完整类
+            实体创建
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.EntityFull`1.Version">
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityBase`1">
             <summary>
-            版本
+            实体基类
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.EntityFull`1.IsDeleted">
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityBase`1.IsDeleted">
             <summary>
             是否删除
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.EntityFull`1.CreatedUserId">
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityBase`1.Version">
+            <summary>
+            版本
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityBase`1.CreatedUserId">
             <summary>
             创建者Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.EntityFull`1.CreatedUserName">
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityBase`1.CreatedUserName">
             <summary>
             创建者
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.EntityFull`1.CreatedTime">
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityBase`1.CreatedTime">
             <summary>
             创建时间
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.EntityFull`1.ModifiedUserId">
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityBase`1.ModifiedUserId">
             <summary>
             修改者Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.EntityFull`1.ModifiedUserName">
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityBase`1.ModifiedUserName">
             <summary>
             修改者
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.EntityFull`1.ModifiedTime">
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityBase`1.ModifiedTime">
             <summary>
             修改时间
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Core.Entities.EntityFull">
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityBase">
             <summary>
-            实体完整类
+            实体基类
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Core.Entities.EntitySoftDelete`1">
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityDelete`1">
             <summary>
             实体软删除
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.EntitySoftDelete`1.IsDeleted">
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityDelete`1.IsDeleted">
             <summary>
             是否删除
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityDelete">
+            <summary>
+            实体软删除
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Entities.EntityUpdate`1">
             <summary>
             实体修改
@@ -1200,6 +1230,11 @@
             修改时间
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityUpdate">
+            <summary>
+            实体修改
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Entities.EntityVersion`1">
             <summary>
             实体版本
@@ -1210,16 +1245,83 @@
             版本
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Core.Entities.ISoftDelete.IsDeleted">
+        <member name="T:ZhonTai.Admin.Core.Entities.IDelete">
+            <summary>
+            删除接口
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.IDelete.IsDeleted">
             <summary>
             是否删除
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.IEntityAdd`1">
+            <summary>
+            添加接口
+            </summary>
+            <typeparam name="TKey"></typeparam>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.IEntityAdd`1.CreatedUserId">
+            <summary>
+            创建者用户Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.IEntityAdd`1.CreatedUserName">
+            <summary>
+            创建者
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.IEntityAdd`1.CreatedTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.IEntityUpdate`1">
+            <summary>
+            修改接口
+            </summary>
+            <typeparam name="TKey"></typeparam>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.IEntityUpdate`1.ModifiedUserId">
+            <summary>
+            修改者Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.IEntityUpdate`1.ModifiedUserName">
+            <summary>
+            修改者
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.IEntityUpdate`1.ModifiedTime">
+            <summary>
+            修改时间
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.IOrg">
+            <summary>
+            部门接口
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.IOrg.CreatedOrgId">
+            <summary>
+            创建者部门Id
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.ITenant">
+            <summary>
+            租户接口
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Core.Entities.ITenant.TenantId">
             <summary>
             租户Id
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.IVersion">
+            <summary>
+            版本接口
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Core.Entities.IVersion.Version">
             <summary>
             数据版本
@@ -2282,7 +2384,7 @@
             性别
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Staff.Input.StaffAddInput.MainOrgId">
+        <member name="P:ZhonTai.Admin.Domain.Staff.Input.StaffAddInput.OrgId">
             <summary>
             主属部门Id
             </summary>
@@ -2612,7 +2714,7 @@
             邮箱
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.User.UserEntity.MainOrgId">
+        <member name="P:ZhonTai.Admin.Domain.User.UserEntity.OrgId">
             <summary>
             主属部门Id
             </summary>
@@ -3121,6 +3223,11 @@
             租户Id
             </summary>
         </member>
+        <member name="P:ZhonTai.Admin.Services.Auth.Dto.AuthLoginOutput.OrgId">
+            <summary>
+            部门Id
+            </summary>
+        </member>
         <member name="P:ZhonTai.Admin.Services.Auth.Dto.AuthLoginOutput.TenantType">
             <summary>
             租户类型
@@ -5357,7 +5464,7 @@
             所属部门
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.MainOrgId">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.OrgId">
             <summary>
             主属部门Id
             </summary>
@@ -5512,7 +5619,7 @@
             部门列表
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserUpdateInput.MainOrgId">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserUpdateInput.OrgId">
             <summary>
             主属部门Id
             </summary>