新增常用基础实体EntityData、EntityTenant、EntityTenantWithData

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

@@ -0,0 +1,31 @@
+using FreeSql.DataAnnotations;
+using System.ComponentModel;
+
+namespace ZhonTai.Admin.Core.Entities;
+
+/// <summary>
+/// 实体数据权限
+/// </summary>
+public class EntityData<TKey> : EntityBase, IData
+{
+    /// <summary>
+    /// 拥有者Id
+    /// </summary>
+    [Description("拥有者Id")]
+    [Column(Position = -41)]
+    public long? OwnerId { get; set; }
+
+    /// <summary>
+    /// 拥有者部门Id
+    /// </summary>
+    [Description("拥有者部门Id")]
+    [Column(Position = -40)]
+    public long? OwnerOrgId { get; set; }
+}
+
+/// <summary>
+/// 实体数据权限
+/// </summary>
+public class EntityData : EntityData<long>
+{
+}

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

@@ -4,7 +4,7 @@ using System.ComponentModel;
 namespace ZhonTai.Admin.Core.Entities;
 
 /// <summary>
-/// 实体软删除
+/// 实体删除
 /// </summary>
 public class EntityDelete<TKey> : EntityUpdate, IDelete
 {
@@ -17,7 +17,7 @@ public class EntityDelete<TKey> : EntityUpdate, IDelete
 }
 
 /// <summary>
-/// 实体软删除
+/// 实体删除
 /// </summary>
 public class EntityDelete : EntityDelete<long>
 {

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

@@ -0,0 +1,24 @@
+using FreeSql.DataAnnotations;
+using System.ComponentModel;
+
+namespace ZhonTai.Admin.Core.Entities;
+
+/// <summary>
+/// 实体租户
+/// </summary>
+public class EntityTenant<TKey> : EntityBase, ITenant
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [Description("租户Id")]
+    [Column(Position = 2, CanUpdate = false)]
+    public long? TenantId { get; set; }
+}
+
+/// <summary>
+/// 实体租户
+/// </summary>
+public class EntityTenant : EntityTenant<long>
+{
+}

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

@@ -0,0 +1,38 @@
+using FreeSql.DataAnnotations;
+using System.ComponentModel;
+
+namespace ZhonTai.Admin.Core.Entities;
+
+/// <summary>
+/// 实体租户数据权限
+/// </summary>
+public class EntityTenantWithData<TKey> : ITenant, IData
+{
+    /// <summary>
+    /// 租户Id
+    /// </summary>
+    [Description("租户Id")]
+    [Column(Position = 2, CanUpdate = false)]
+    public long? TenantId { get; set; }
+
+    /// <summary>
+    /// 拥有者Id
+    /// </summary>
+    [Description("拥有者Id")]
+    [Column(Position = -41)]
+    public long? OwnerId { get; set; }
+
+    /// <summary>
+    /// 拥有者部门Id
+    /// </summary>
+    [Description("拥有者部门Id")]
+    [Column(Position = -40)]
+    public long? OwnerOrgId { get; set; }
+}
+
+/// <summary>
+/// 实体租户数据权限
+/// </summary>
+public class EntityTenantWithData : EntityTenantWithData<long>
+{
+}

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

@@ -6,7 +6,7 @@ namespace ZhonTai.Admin.Core.Entities;
 /// <summary>
 /// 实体版本
 /// </summary>
-public class EntityVersion<TKey> : EntityDelete, IVersion
+public class EntityVersion<TKey> : EntityBase, IVersion
 {
     /// <summary>
     /// 版本
@@ -16,6 +16,9 @@ public class EntityVersion<TKey> : EntityDelete, IVersion
     public long Version { get; set; }
 }
 
+/// <summary>
+/// 实体版本
+/// </summary>
 public class EntityVersion : EntityVersion<long>
 {
 }

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

@@ -9,14 +9,8 @@ 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 : EntityBase, ITenant
+public partial class DictionaryEntity : EntityTenant
 {
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [Column(Position = 2, CanUpdate = false)]
-    public long? TenantId { get; set; }
-
     /// <summary>
     /// 字典类型Id
     /// </summary>

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

@@ -8,14 +8,8 @@ namespace ZhonTai.Admin.Domain.DictionaryType;
 /// </summary>
 [Table(Name = "ad_dictionary_type")]
 [Index("idx_{tablename}_01", nameof(Name) + "," + nameof(TenantId), true)]
-public class DictionaryTypeEntity : EntityBase, ITenant
+public class DictionaryTypeEntity : EntityTenant
 {
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [Column(Position = 2, CanUpdate = false)]
-    public long? TenantId { get; set; }
-
     /// <summary>
     /// 名称
     /// </summary>

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

@@ -8,14 +8,8 @@ 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 : EntityBase, ITenant
+public partial class DocumentEntity : EntityTenant
 {
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [Column(Position = 2, CanUpdate = false)]
-    public long? TenantId { get; set; }
-
     /// <summary>
     /// 父级节点
     /// </summary>

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

@@ -13,14 +13,8 @@ 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 : EntityBase, ITenant
+public partial class OrgEntity : EntityTenant
 {
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [Column(Position = -10, CanUpdate = false)]
-    public long? TenantId { get; set; }
-
     /// <summary>
     /// 父级
     /// </summary>

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

@@ -15,14 +15,8 @@ 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 : EntityBase, ITenant
+public partial class RoleEntity : EntityTenant
 {
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [Column(Position = 2, CanUpdate = false)]
-    public long? TenantId { get; set; }
-
     /// <summary>
     /// 父级Id
     /// </summary>

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

@@ -16,14 +16,8 @@ namespace ZhonTai.Admin.Domain.User;
 /// </summary>
 [Table(Name = "ad_user")]
 [Index("idx_{tablename}_01", nameof(UserName) + "," + nameof(TenantId), true)]
-public partial class UserEntity : EntityBase, ITenant
+public partial class UserEntity : EntityTenant
 {
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [Column(Position = 2)]
-    public long? TenantId { get; set; }
-
     public TenantEntity Tenant { get; set; }
 
     /// <summary>

src/platform/ZhonTai.Admin/Domain/UserStaff/UserStaffEntity.cs

@@ -8,14 +8,8 @@ namespace ZhonTai.Admin.Domain.UserStaff;
 /// 用户员工
 /// </summary>
 [Table(Name = "ad_user_staff")]
-public partial class UserStaffEntity : EntityBase, ITenant
+public partial class UserStaffEntity : EntityTenant
 {
-    /// <summary>
-    /// 租户Id
-    /// </summary>
-    [Column(Position = -10)]
-    public long? TenantId { get; set; }
-
     /// <summary>
     /// 职位
     /// </summary>

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

@@ -1132,9 +1132,29 @@
             实体基类
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityData`1">
+            <summary>
+            实体数据权限
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityData`1.OwnerId">
+            <summary>
+            拥有者Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityData`1.OwnerOrgId">
+            <summary>
+            拥有者部门Id
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityData">
+            <summary>
+            实体数据权限
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Entities.EntityDelete`1">
             <summary>
-            实体软删除
+            实体删除
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Core.Entities.EntityDelete`1.IsDeleted">
@@ -1144,7 +1164,47 @@
         </member>
         <member name="T:ZhonTai.Admin.Core.Entities.EntityDelete">
             <summary>
-            实体软删除
+            实体删除
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityTenant`1">
+            <summary>
+            实体租户
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityTenant`1.TenantId">
+            <summary>
+            租户Id
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityTenant">
+            <summary>
+            实体租户
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityTenantWithData`1">
+            <summary>
+            实体租户数据权限
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityTenantWithData`1.TenantId">
+            <summary>
+            租户Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityTenantWithData`1.OwnerId">
+            <summary>
+            拥有者Id
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Core.Entities.EntityTenantWithData`1.OwnerOrgId">
+            <summary>
+            拥有者部门Id
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityTenantWithData">
+            <summary>
+            实体租户数据权限
             </summary>
         </member>
         <member name="T:ZhonTai.Admin.Core.Entities.EntityUpdate`1">
@@ -1182,6 +1242,11 @@
             版本
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Entities.EntityVersion">
+            <summary>
+            实体版本
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Entities.IData">
             <summary>
             数据权限接口
@@ -1666,11 +1731,6 @@
             数据字典类型
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.DictionaryType.DictionaryTypeEntity.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.DictionaryType.DictionaryTypeEntity.Name">
             <summary>
             名称
@@ -1706,11 +1766,6 @@
             数据字典
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Dictionary.DictionaryEntity.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.Dictionary.DictionaryEntity.DictionaryTypeId">
             <summary>
             字典类型Id
@@ -1781,11 +1836,6 @@
             文档
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Document.DocumentEntity.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.Document.DocumentEntity.ParentId">
             <summary>
             父级节点
@@ -1972,11 +2022,6 @@
             组织架构
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.Org.OrgEntity.ParentId">
             <summary>
             父级
@@ -2267,11 +2312,6 @@
             角色
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.Role.RoleEntity.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.Role.RoleEntity.ParentId">
             <summary>
             父级Id
@@ -2592,11 +2632,6 @@
             用户员工
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.UserStaff.UserStaffEntity.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.UserStaff.UserStaffEntity.Position">
             <summary>
             职位
@@ -2642,11 +2677,6 @@
             用户
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.User.UserEntity.TenantId">
-            <summary>
-            租户Id
-            </summary>
-        </member>
         <member name="P:ZhonTai.Admin.Domain.User.UserEntity.UserName">
             <summary>
             账号