v0.8.5

Extensions/FreeSql.Extensions.BaseEntity/BaseEntity.cs

@@ -7,65 +7,129 @@ using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
 
-/// <summary>
-/// 包括 CreateTime/UpdateTime/IsDeleted 的实体基类
-/// </summary>
-[Table(DisableSyncStructure = true)]
-public abstract class BaseEntity
+namespace FreeSql
 {
-    static IFreeSql _ormPriv;
     /// <summary>
-    /// 全局 IFreeSql orm 对象
+    /// 包括 CreateTime/UpdateTime/IsDeleted、CRUD 方法、以及 ID 主键定义 的实体基类
+    /// <para></para>
+    /// 当 TKey 为 int/long 时，Id 主键被设为自增值主键
     /// </summary>
-    public static IFreeSql Orm => _ormPriv ?? throw new Exception(@"使用前请初始化 BaseEntity.Initialization(new FreeSqlBuilder()
-.UseAutoSyncStructure(true)
-.UseConnectionString(DataType.Sqlite, ""data source=test.db;max pool size=5"")
-.Build());");
-
-    /// <summary>
-	/// 初始化BaseEntity
-	/// BaseEntity.Initialization(new FreeSqlBuilder()
-    /// <para></para>
-    /// .UseAutoSyncStructure(true)
-    /// <para></para>
-    /// .UseConnectionString(DataType.Sqlite, "data source=test.db;max pool size=5")
-    /// <para></para>
-    /// .Build());
-	/// </summary>
-	/// <param name="fsql">IFreeSql orm 对象</param>
-	public static void Initialization(IFreeSql fsql)
+    /// <typeparam name="TEntity"></typeparam>
+    /// <typeparam name="TKey"></typeparam>
+    [Table(DisableSyncStructure = true)]
+    public abstract class BaseEntity<TEntity, TKey> : BaseEntity<TEntity> where TEntity : class
     {
-        _ormPriv = fsql;
-        _ormPriv.Aop.CurdBefore += (s, e) => Trace.WriteLine(e.Sql + "\r\n");
+        static BaseEntity()
+        {
+            var tkeyType = typeof(TKey)?.NullableTypeOrThis();
+            if (tkeyType == typeof(int) || tkeyType == typeof(long))
+                Orm.CodeFirst.ConfigEntity(typeof(TEntity),
+                    t => t.Property("Id").IsIdentity(true));
         }
 
         /// <summary>
-    /// 创建时间
+        /// 主键
         /// </summary>
-    public DateTime CreateTime { get; set; }
-    /// <summary>
-    /// 更新时间
-    /// </summary>
-    public DateTime UpdateTime { get; set; }
-    /// <summary>
-    /// 逻辑删除
-    /// </summary>
-    public bool IsDeleted { get; set; }
+        public virtual TKey Id { get; set; }
 
         /// <summary>
-    /// 开启工作单元事务
+        /// 根据主键值获取数据
         /// </summary>
+        /// <param name="id"></param>
         /// <returns></returns>
-    public static IUnitOfWork Begin() => Begin(null);
-    /// <summary>
-    /// 开启工作单元事务
-    /// </summary>
-    /// <param name="level">事务等级</param>
-    /// <returns></returns>
-    public static IUnitOfWork Begin(IsolationLevel? level)
+        async public static Task<TEntity> FindAsync(TKey id)
         {
-        var uow = Orm.CreateUnitOfWork();
-        uow.IsolationLevel = level;
-        return uow;
+            var item = await Select.WhereDynamic(id).FirstAsync();
+            (item as BaseEntity<TEntity>)?.Attach();
+            return item;
+        }
+
+        /// <summary>
+        /// 根据主键值获取数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public static TEntity Find(TKey id)
+        {
+            var item = Select.WhereDynamic(id).First();
+            (item as BaseEntity<TEntity>)?.Attach();
+            return item;
+        }
+    }
+
+    /// <summary>
+    /// 包括 CreateTime/UpdateTime/IsDeleted、以及 CRUD 异步和同步方法的实体基类
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    [Table(DisableSyncStructure = true)]
+    public abstract class BaseEntity<TEntity> : BaseEntityAsync<TEntity> where TEntity : class
+    {
+        bool UpdateIsDeleted(bool value)
+        {
+            if (this.Repository == null)
+                return Orm.Update<TEntity>(this as TEntity)
+                    .WithTransaction(UnitOfWork.Current.Value?.GetOrBeginTransaction())
+                    .Set(a => (a as BaseEntity).IsDeleted, this.IsDeleted = value).ExecuteAffrows() == 1;
+
+            this.SetTenantId();
+            this.IsDeleted = value;
+            this.Repository.UnitOfWork = UnitOfWork.Current.Value;
+            return this.Repository.Update(this as TEntity) == 1;
+        }
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool Delete() => this.UpdateIsDeleted(true);
+        /// <summary>
+        /// 恢复删除的数据
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool Restore() => this.UpdateIsDeleted(false);
+
+        /// <summary>
+        /// 更新数据
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool Update()
+        {
+            this.UpdateTime = DateTime.Now;
+            if (this.Repository == null)
+                return Orm.Update<TEntity>()
+                    .WithTransaction(UnitOfWork.Current.Value?.GetOrBeginTransaction())
+                    .SetSource(this as TEntity).ExecuteAffrows() == 1;
+
+            this.SetTenantId();
+            this.Repository.UnitOfWork = UnitOfWork.Current.Value;
+            return this.Repository.Update(this as TEntity) == 1;
+        }
+        /// <summary>
+        /// 插入数据
+        /// </summary>
+        public virtual TEntity Insert()
+        {
+            this.CreateTime = DateTime.Now;
+            if (this.Repository == null)
+                this.Repository = Orm.GetRepository<TEntity>();
+
+            this.SetTenantId();
+            this.Repository.UnitOfWork = UnitOfWork.Current.Value;
+            return this.Repository.Insert(this as TEntity);
+        }
+
+        /// <summary>
+        /// 更新或插入
+        /// </summary>
+        /// <returns></returns>
+        public virtual TEntity Save()
+        {
+            this.UpdateTime = DateTime.Now;
+            if (this.Repository == null)
+                this.Repository = Orm.GetRepository<TEntity>();
+
+            this.SetTenantId();
+            this.Repository.UnitOfWork = UnitOfWork.Current.Value;
+            return this.Repository.InsertOrUpdate(this as TEntity);
+        }
     }
 }

Extensions/FreeSql.Extensions.BaseEntity/BaseEntityAsync.cs

@@ -1,60 +1,53 @@
 using FreeSql;
 using FreeSql.DataAnnotations;
 using System;
-using System.Data;
-using System.Diagnostics;
-using System.Linq.Expressions;
-using System.Threading;
 using System.Threading.Tasks;
 
-/// <summary>
-/// 包括 CreateTime/UpdateTime/IsDeleted、以及 CRUD 异步方法的实体基类
-/// </summary>
-/// <typeparam name="TEntity"></typeparam>
-[Table(DisableSyncStructure = true)]
-public abstract class BaseEntityAsync<TEntity> : BaseEntity where TEntity : class
+namespace FreeSql
 {
     /// <summary>
-    /// 查询数据
+    /// 包括 CreateTime/UpdateTime/IsDeleted、CRUD 异步方法、以及 ID 主键定义 的实体基类
+    /// <para></para>
+    /// 当 TKey 为 int/long 时，Id 主键被设为自增值主键
     /// </summary>
-    /// <returns></returns>
-    public static ISelect<TEntity> Select => Orm.Select<TEntity>()
-        .WithTransaction(UnitOfWork.Current.Value?.GetOrBeginTransaction(false))
-        .WhereCascade(a => (a as BaseEntity).IsDeleted == false);
-    /// <summary>
-    /// 查询条件，Where(a => a.Id > 10)，支持导航对象查询，Where(a => a.Author.Email == "2881099@qq.com")
-    /// </summary>
-    /// <param name="exp">lambda表达式</param>
-    /// <returns></returns>
-    public static ISelect<TEntity> Where(Expression<Func<TEntity, bool>> exp) => Select.Where(exp);
-    /// <summary>
-    /// 查询条件，Where(true, a => a.Id > 10)，支导航对象查询，Where(true, a => a.Author.Email == "2881099@qq.com")
-    /// </summary>
-    /// <param name="condition">true 时生效</param>
-    /// <param name="exp">lambda表达式</param>
-    /// <returns></returns>
-    public static ISelect<TEntity> WhereIf(bool condition, Expression<Func<TEntity, bool>> exp) => Select.WhereIf(condition, exp);
-
-    /// <summary>
-    /// 仓储对象
-    /// </summary>
-    protected IBaseRepository<TEntity> Repository { get; set; }
-
-    /// <summary>
-    /// 附加实体，在更新数据时，只更新变化的部分
-    /// </summary>
-    public TEntity Attach()
+    /// <typeparam name="TEntity"></typeparam>
+    /// <typeparam name="TKey"></typeparam>
+    [Table(DisableSyncStructure = true)]
+    public abstract class BaseEntityAsync<TEntity, TKey> : BaseEntityAsync<TEntity> where TEntity : class
     {
-        if (this.Repository == null)
-            this.Repository = Orm.GetRepository<TEntity>();
-
-        var item = this as TEntity;
-        this.Repository.Attach(item);
-        return item;
+        static BaseEntityAsync()
+        {
+            var tkeyType = typeof(TKey)?.NullableTypeOrThis();
+            if (tkeyType == typeof(int) || tkeyType == typeof(long))
+                Orm.CodeFirst.ConfigEntity(typeof(TEntity),
+                    t => t.Property("Id").IsIdentity(true));
         }
 
-    /**  async **/
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public virtual TKey Id { get; set; }
 
+        /// <summary>
+        /// 根据主键值获取数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        async public static Task<TEntity> FindAsync(TKey id)
+        {
+            var item = await Select.WhereDynamic(id).FirstAsync();
+            (item as BaseEntity<TEntity>)?.Attach();
+            return item;
+        }
+    }
+
+    /// <summary>
+    /// 包括 CreateTime/UpdateTime/IsDeleted、以及 CRUD 异步方法的实体基类
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    [Table(DisableSyncStructure = true)]
+    public abstract class BaseEntityAsync<TEntity> : BaseEntityReadOnly<TEntity> where TEntity : class
+    {
         async Task<bool> UpdateIsDeletedAsync(bool value)
         {
             if (this.Repository == null)
@@ -89,6 +82,7 @@ public abstract class BaseEntityAsync<TEntity> : BaseEntity where TEntity : clas
                     .WithTransaction(UnitOfWork.Current.Value?.GetOrBeginTransaction())
                     .SetSource(this as TEntity).ExecuteAffrowsAsync() == 1;
 
+            this.SetTenantId();
             this.Repository.UnitOfWork = UnitOfWork.Current.Value;
             return await this.Repository.UpdateAsync(this as TEntity) == 1;
         }
@@ -101,6 +95,7 @@ public abstract class BaseEntityAsync<TEntity> : BaseEntity where TEntity : clas
             if (this.Repository == null)
                 this.Repository = Orm.GetRepository<TEntity>();
 
+            this.SetTenantId();
             this.Repository.UnitOfWork = UnitOfWork.Current.Value;
             return this.Repository.InsertAsync(this as TEntity);
         }
@@ -115,7 +110,9 @@ public abstract class BaseEntityAsync<TEntity> : BaseEntity where TEntity : clas
             if (this.Repository == null)
                 this.Repository = Orm.GetRepository<TEntity>();
 
+            this.SetTenantId();
             this.Repository.UnitOfWork = UnitOfWork.Current.Value;
             return this.Repository.InsertOrUpdateAsync(this as TEntity);
         }
+    }
 }

Extensions/FreeSql.Extensions.BaseEntity/BaseEntityAsyncTKey.cs

@@ -1,44 +0,0 @@
-using FreeSql;
-using FreeSql.DataAnnotations;
-using System;
-using System.Data;
-using System.Diagnostics;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-/// <summary>
-/// 包括 CreateTime/UpdateTime/IsDeleted、CRUD 异步方法、以及 ID 主键定义 的实体基类
-/// <para></para>
-/// 当 TKey 为 int/long 时，Id 主键被设为自增值主键
-/// </summary>
-/// <typeparam name="TEntity"></typeparam>
-/// <typeparam name="TKey"></typeparam>
-[Table(DisableSyncStructure = true)]
-public abstract class BaseEntityAsync<TEntity, TKey> : BaseEntityAsync<TEntity> where TEntity : class
-{
-    static BaseEntityAsync()
-    {
-        var tkeyType = typeof(TKey)?.NullableTypeOrThis();
-        if (tkeyType == typeof(int) || tkeyType == typeof(long))
-            Orm.CodeFirst.ConfigEntity(typeof(TEntity),
-                t => t.Property("Id").IsIdentity(true));
-    }
-
-    /// <summary>
-    /// 主键
-    /// </summary>
-    public virtual TKey Id { get; set; }
-
-    /// <summary>
-    /// 根据主键值获取数据
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    async public static Task<TEntity> FindAsync(TKey id)
-    {
-        var item = await Select.WhereDynamic(id).FirstAsync();
-        (item as BaseEntity<TEntity>)?.Attach();
-        return item;
-    }
-}

Extensions/FreeSql.Extensions.BaseEntity/BaseEntityReadOnly.cs

@@ -0,0 +1,160 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Data;
+using System.Diagnostics;
+using System.Linq.Expressions;
+using System.Threading;
+
+namespace FreeSql
+{
+    /// <summary>
+    /// 包括 CreateTime/UpdateTime/IsDeleted 的实体基类
+    /// </summary>
+    [Table(DisableSyncStructure = true)]
+    public abstract class BaseEntity
+    {
+        static IFreeSql _ormPriv;
+        /// <summary>
+        /// 全局 IFreeSql orm 对象
+        /// </summary>
+        public static IFreeSql Orm => _ormPriv ?? throw new Exception(@"使用前请初始化 BaseEntity.Initialization(new FreeSqlBuilder()
+.UseAutoSyncStructure(true)
+.UseConnectionString(DataType.Sqlite, ""data source=test.db;max pool size=5"")
+.Build());");
+
+        /// <summary>
+        /// 初始化BaseEntity
+        /// BaseEntity.Initialization(new FreeSqlBuilder()
+        /// <para></para>
+        /// .UseAutoSyncStructure(true)
+        /// <para></para>
+        /// .UseConnectionString(DataType.Sqlite, "data source=test.db;max pool size=5")
+        /// <para></para>
+        /// .Build());
+        /// </summary>
+        /// <param name="fsql">IFreeSql orm 对象</param>
+        public static void Initialization(IFreeSql fsql)
+        {
+            _ormPriv = fsql;
+            _ormPriv.Aop.CurdBefore += (s, e) => Trace.WriteLine(e.Sql + "\r\n");
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+        /// <summary>
+        /// 逻辑删除
+        /// </summary>
+        public bool IsDeleted { get; set; }
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 开启工作单元事务
+        /// </summary>
+        /// <returns></returns>
+        public static IUnitOfWork Begin() => Begin(null);
+        /// <summary>
+        /// 开启工作单元事务
+        /// </summary>
+        /// <param name="level">事务等级</param>
+        /// <returns></returns>
+        public static IUnitOfWork Begin(IsolationLevel? level)
+        {
+            var uow = Orm.CreateUnitOfWork();
+            uow.IsolationLevel = level;
+            return uow;
+        }
+
+        static readonly AsyncLocal<string> _AsyncTenantId = new AsyncLocal<string>();
+        /// <summary>
+        /// 获取或设置当前租户id
+        /// </summary>
+        public static string CurrentTenantId
+        {
+            get => _AsyncTenantId.Value;
+            set => _AsyncTenantId.Value = value;
+        }
+    }
+
+    /// <summary>
+    /// 租户
+    /// </summary>
+    public interface ITenant
+    {
+        /// <summary>
+        /// 租户id
+        /// </summary>
+        string TenantId { get; set; }
+    }
+
+    public abstract class BaseEntityReadOnly<TEntity> : BaseEntity where TEntity : class
+    {
+        /// <summary>
+        /// 查询数据
+        /// </summary>
+        /// <returns></returns>
+        public static ISelect<TEntity> Select
+        {
+            get
+            {
+                var select = Orm.Select<TEntity>().WithTransaction(UnitOfWork.Current.Value?.GetOrBeginTransaction(false));
+                if (string.IsNullOrEmpty(CurrentTenantId) == false)
+                    select.WhereCascade(a => (a as ITenant).TenantId == CurrentTenantId);
+                return select.WhereCascade(a => (a as BaseEntity).IsDeleted == false);
+            }
+        }
+        /// <summary>
+        /// 设置当前租户id
+        /// </summary>
+        protected void SetTenantId()
+        {
+            if (string.IsNullOrEmpty(CurrentTenantId) == false)
+            {
+                var ten = this as ITenant;
+                if (ten != null)
+                    ten.TenantId = CurrentTenantId;
+            }
+        }
+
+        /// <summary>
+        /// 查询条件，Where(a => a.Id > 10)，支持导航对象查询，Where(a => a.Author.Email == "2881099@qq.com")
+        /// </summary>
+        /// <param name="exp">lambda表达式</param>
+        /// <returns></returns>
+        public static ISelect<TEntity> Where(Expression<Func<TEntity, bool>> exp) => Select.Where(exp);
+        /// <summary>
+        /// 查询条件，Where(true, a => a.Id > 10)，支导航对象查询，Where(true, a => a.Author.Email == "2881099@qq.com")
+        /// </summary>
+        /// <param name="condition">true 时生效</param>
+        /// <param name="exp">lambda表达式</param>
+        /// <returns></returns>
+        public static ISelect<TEntity> WhereIf(bool condition, Expression<Func<TEntity, bool>> exp) => Select.WhereIf(condition, exp);
+
+        /// <summary>
+        /// 仓储对象
+        /// </summary>
+        protected IBaseRepository<TEntity> Repository { get; set; }
+
+        /// <summary>
+        /// 附加实体，在更新数据时，只更新变化的部分
+        /// </summary>
+        public TEntity Attach()
+        {
+            if (this.Repository == null)
+                this.Repository = Orm.GetRepository<TEntity>();
+
+            var item = this as TEntity;
+            this.SetTenantId();
+            this.Repository.Attach(item);
+            return item;
+        }
+    }
+}

Extensions/FreeSql.Extensions.BaseEntity/BaseEntitySync.cs

@@ -1,80 +0,0 @@
-using FreeSql;
-using FreeSql.DataAnnotations;
-using System;
-using System.Data;
-using System.Diagnostics;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-/// <summary>
-/// 包括 CreateTime/UpdateTime/IsDeleted、以及 CRUD 异步和同步方法的实体基类
-/// </summary>
-/// <typeparam name="TEntity"></typeparam>
-[Table(DisableSyncStructure = true)]
-public abstract class BaseEntity<TEntity> : BaseEntityAsync<TEntity> where TEntity : class
-{
-    bool UpdateIsDeleted(bool value)
-    {
-        if (this.Repository == null)
-            return Orm.Update<TEntity>(this as TEntity)
-                .WithTransaction(UnitOfWork.Current.Value?.GetOrBeginTransaction())
-                .Set(a => (a as BaseEntity).IsDeleted, this.IsDeleted = value).ExecuteAffrows() == 1;
-
-        this.IsDeleted = value;
-        this.Repository.UnitOfWork = UnitOfWork.Current.Value;
-        return this.Repository.Update(this as TEntity) == 1;
-    }
-    /// <summary>
-    /// 删除数据
-    /// </summary>
-    /// <returns></returns>
-    public virtual bool Delete() => this.UpdateIsDeleted(true);
-    /// <summary>
-    /// 恢复删除的数据
-    /// </summary>
-    /// <returns></returns>
-    public virtual bool Restore() => this.UpdateIsDeleted(false);
-
-    /// <summary>
-    /// 更新数据
-    /// </summary>
-    /// <returns></returns>
-    public virtual bool Update()
-    {
-        this.UpdateTime = DateTime.Now;
-        if (this.Repository == null)
-            return Orm.Update<TEntity>()
-                .WithTransaction(UnitOfWork.Current.Value?.GetOrBeginTransaction())
-                .SetSource(this as TEntity).ExecuteAffrows() == 1;
-
-        this.Repository.UnitOfWork = UnitOfWork.Current.Value;
-        return this.Repository.Update(this as TEntity) == 1;
-    }
-    /// <summary>
-    /// 插入数据
-    /// </summary>
-    public virtual TEntity Insert()
-    {
-        this.CreateTime = DateTime.Now;
-        if (this.Repository == null)
-            this.Repository = Orm.GetRepository<TEntity>();
-
-        this.Repository.UnitOfWork = UnitOfWork.Current.Value;
-        return this.Repository.Insert(this as TEntity);
-    }
-
-    /// <summary>
-    /// 更新或插入
-    /// </summary>
-    /// <returns></returns>
-    public virtual TEntity Save()
-    {
-        this.UpdateTime = DateTime.Now;
-        if (this.Repository == null)
-            this.Repository = Orm.GetRepository<TEntity>();
-
-        this.Repository.UnitOfWork = UnitOfWork.Current.Value;
-        return this.Repository.InsertOrUpdate(this as TEntity);
-    }
-}

Extensions/FreeSql.Extensions.BaseEntity/BaseEntitySyncTKey.cs

@@ -1,56 +0,0 @@
-using FreeSql;
-using FreeSql.DataAnnotations;
-using System;
-using System.Data;
-using System.Diagnostics;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-/// <summary>
-/// 包括 CreateTime/UpdateTime/IsDeleted、CRUD 方法、以及 ID 主键定义 的实体基类
-/// <para></para>
-/// 当 TKey 为 int/long 时，Id 主键被设为自增值主键
-/// </summary>
-/// <typeparam name="TEntity"></typeparam>
-/// <typeparam name="TKey"></typeparam>
-[Table(DisableSyncStructure = true)]
-public abstract class BaseEntity<TEntity, TKey> : BaseEntity<TEntity> where TEntity : class
-{
-    static BaseEntity()
-    {
-        var tkeyType = typeof(TKey)?.NullableTypeOrThis();
-        if (tkeyType == typeof(int) || tkeyType == typeof(long))
-            Orm.CodeFirst.ConfigEntity(typeof(TEntity),
-                t => t.Property("Id").IsIdentity(true));
-    }
-
-    /// <summary>
-    /// 主键
-    /// </summary>
-    public virtual TKey Id { get; set; }
-
-    /// <summary>
-    /// 根据主键值获取数据
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    async public static Task<TEntity> FindAsync(TKey id)
-    {
-        var item = await Select.WhereDynamic(id).FirstAsync();
-        (item as BaseEntity<TEntity>)?.Attach();
-        return item;
-    }
-
-    /// <summary>
-    /// 根据主键值获取数据
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    public static TEntity Find(TKey id)
-    {
-        var item = Select.WhereDynamic(id).First();
-        (item as BaseEntity<TEntity>)?.Attach();
-        return item;
-    }
-}

Extensions/FreeSql.Extensions.BaseEntity/BaseEntityTree.cs

@@ -0,0 +1,164 @@
+using FreeSql;
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FreeSql
+{
+    /// <summary>
+    /// 树状基类
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    /// <typeparam name="TKey"></typeparam>
+    [Table(DisableSyncStructure = true)]
+    public abstract class BaseEntityTree<TEntity, TKey> : BaseEntity<TEntity, TKey> where TEntity : class
+    {
+        /// <summary>
+        /// 父级id
+        /// </summary>
+        public TKey ParentId
+        {
+            get => _ParentId;
+            set
+            {
+                if (Equals(value, default(TKey)) == false && Equals(value, Id))
+                    throw new ArgumentException("ParentId 值不能与 Id 相同");
+                _ParentId = value;
+            }
+        }
+        public TEntity Parent { get; set; }
+        private TKey _ParentId;
+
+        /// <summary>
+        /// 下级列表
+        /// </summary>
+        [Navigate("ParentId")]
+        public List<TEntity> Childs { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 名称：技术部-前端
+        /// </summary>
+        public string FullName { get; set; }
+
+        public List<TEntity> GetAllChilds() => Select.WhereDynamic(this)
+            .IncludeMany(a => (a as BaseEntityTree<TEntity, TKey>).Childs,
+                t1 => t1.IncludeMany(a1 => (a1 as BaseEntityTree<TEntity, TKey>).Childs,
+                t2 => t2.IncludeMany(a2 => (a2 as BaseEntityTree<TEntity, TKey>).Childs,
+                t3 => t3.IncludeMany(a3 => (a3 as BaseEntityTree<TEntity, TKey>).Childs,
+                t4 => t4.IncludeMany(a4 => (a4 as BaseEntityTree<TEntity, TKey>).Childs,
+                t5 => t5.IncludeMany(a5 => (a5 as BaseEntityTree<TEntity, TKey>).Childs,
+                t6 => t6.IncludeMany(a6 => (a6 as BaseEntityTree<TEntity, TKey>).Childs,
+                t7 => t7.IncludeMany(a7 => (a7 as BaseEntityTree<TEntity, TKey>).Childs,
+                t8 => t8.IncludeMany(a8 => (a8 as BaseEntityTree<TEntity, TKey>).Childs,
+                t9 => t9.IncludeMany(a9 => (a9 as BaseEntityTree<TEntity, TKey>).Childs,
+                t10 => t10.IncludeMany(a10 => (a10 as BaseEntityTree<TEntity, TKey>).Childs))))))))))).ToList()
+                .SelectMany(a => (a as BaseEntityTree<TEntity, TKey>).Childs
+                .SelectMany(a1 => (a1 as BaseEntityTree<TEntity, TKey>)?.Childs
+                .SelectMany(a2 => (a2 as BaseEntityTree<TEntity, TKey>)?.Childs
+                .SelectMany(a3 => (a3 as BaseEntityTree<TEntity, TKey>)?.Childs
+                .SelectMany(a4 => (a4 as BaseEntityTree<TEntity, TKey>)?.Childs
+                .SelectMany(a5 => (a5 as BaseEntityTree<TEntity, TKey>)?.Childs
+                .SelectMany(a6 => (a6 as BaseEntityTree<TEntity, TKey>)?.Childs
+                .SelectMany(a7 => (a7 as BaseEntityTree<TEntity, TKey>)?.Childs
+                .SelectMany(a8 => (a8 as BaseEntityTree<TEntity, TKey>)?.Childs
+                .SelectMany(a9 => (a9 as BaseEntityTree<TEntity, TKey>)?.Childs
+                .SelectMany(a10 => (a10 as BaseEntityTree<TEntity, TKey>)?.Childs))))))))))).Where(a => a != null).ToList();
+
+        protected void RefershFullName()
+        {
+            var buf = new List<TEntity>();
+            buf.Add(this as TEntity);
+            buf.AddRange(this.GetAllChilds());
+            var repo = Orm.GetRepository<TEntity>();
+            repo.UnitOfWork = UnitOfWork.Current.Value;
+            buf = repo.Select.WhereDynamic(buf)
+                .Include(a => ((((((((((a as BaseEntityTree<TEntity, TKey>).Parent
+                    as BaseEntityTree<TEntity, TKey>).Parent
+                    as BaseEntityTree<TEntity, TKey>).Parent
+                    as BaseEntityTree<TEntity, TKey>).Parent
+                    as BaseEntityTree<TEntity, TKey>).Parent
+                    as BaseEntityTree<TEntity, TKey>).Parent
+                    as BaseEntityTree<TEntity, TKey>).Parent
+                    as BaseEntityTree<TEntity, TKey>).Parent
+                    as BaseEntityTree<TEntity, TKey>).Parent
+                    as BaseEntityTree<TEntity, TKey>).Parent).ToList(true);
+            foreach (var item in buf)
+            {
+                var up = item as BaseEntityTree<TEntity, TKey>;
+                up.Name = up.Name;
+                var cur = up.Parent as BaseEntityTree<TEntity, TKey>;
+                while (cur != null)
+                {
+                    up.Name = $"{cur.Name}-{up.Name}";
+                    cur = cur.Parent as BaseEntityTree<TEntity, TKey>;
+                }
+            }
+            repo.Update(buf);
+        }
+
+        T UpdateIsDelete<T>(bool value, Func<BaseRepository<TEntity>, List<TEntity>, T> func)
+        {
+            var childs = GetAllChilds();
+            childs.Add(this as TEntity);
+            var repo = Orm.GetRepository<TEntity>();
+            repo.UnitOfWork = UnitOfWork.Current.Value;
+            repo.Attach(childs);
+            foreach (var item in childs)
+                (item as BaseEntity).IsDeleted = false;
+            return func(repo, childs);
+        }
+        public override bool Delete() => UpdateIsDelete(true, (repo, chis) => repo.Update(chis)) > 0;
+        async public override Task<bool> DeleteAsync() => await UpdateIsDelete(true, (repo, chis) => repo.UpdateAsync(chis)) > 0;
+
+        public override bool Restore() => UpdateIsDelete(false, (repo, chis) => repo.Update(chis)) > 0;
+        async public override Task<bool> RestoreAsync() => await UpdateIsDelete(false, (repo, chis) => repo.UpdateAsync(chis)) > 0;
+
+        public override TEntity Insert()
+        {
+            var ret = base.Insert();
+            RefershFullName();
+            return ret;
+        }
+        async public override Task<TEntity> InsertAsync()
+        {
+            var ret = await base.InsertAsync();
+            RefershFullName();
+            return ret;
+        }
+        public override bool Update()
+        {
+            var old = Find(this.Id) as BaseEntityTree<TEntity, TKey>;
+            var ret = base.Update();
+            if (old.Name != this.Name || Equals(old.ParentId, old.ParentId) == false) RefershFullName();
+            return ret;
+        }
+        async public override Task<bool> UpdateAsync()
+        {
+            var old = Find(this.Id) as BaseEntityTree<TEntity, TKey>;
+            var ret = await base.UpdateAsync();
+            if (old.Name != this.Name || Equals(old.ParentId, old.ParentId) == false) RefershFullName();
+            return ret;
+        }
+        public override TEntity Save()
+        {
+            var old = Find(this.Id) as BaseEntityTree<TEntity, TKey>;
+            var ret = base.Save();
+            if (old.Name != this.Name || Equals(old.ParentId, old.ParentId) == false) RefershFullName();
+            return ret;
+        }
+        async public override Task<TEntity> SaveAsync()
+        {
+            var old = Find(this.Id) as BaseEntityTree<TEntity, TKey>;
+            var ret = await base.SaveAsync();
+            if (old.Name != this.Name || Equals(old.ParentId, old.ParentId) == false) RefershFullName();
+            return ret;
+        }
+    }
+}

Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.xml

@@ -4,17 +4,136 @@
         <name>FreeSql.Extensions.BaseEntity</name>
     </assembly>
     <members>
-        <member name="T:BaseEntity">
+        <member name="T:FreeSql.BaseEntity`2">
+            <summary>
+            包括 CreateTime/UpdateTime/IsDeleted、CRUD 方法、以及 ID 主键定义 的实体基类
+            <para></para>
+            当 TKey 为 int/long 时，Id 主键被设为自增值主键
+            </summary>
+            <typeparam name="TEntity"></typeparam>
+            <typeparam name="TKey"></typeparam>
+        </member>
+        <member name="P:FreeSql.BaseEntity`2.Id">
+            <summary>
+            主键
+            </summary>
+        </member>
+        <member name="M:FreeSql.BaseEntity`2.FindAsync(`1)">
+            <summary>
+            根据主键值获取数据
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.BaseEntity`2.Find(`1)">
+            <summary>
+            根据主键值获取数据
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="T:FreeSql.BaseEntity`1">
+            <summary>
+            包括 CreateTime/UpdateTime/IsDeleted、以及 CRUD 异步和同步方法的实体基类
+            </summary>
+            <typeparam name="TEntity"></typeparam>
+        </member>
+        <member name="M:FreeSql.BaseEntity`1.Delete">
+            <summary>
+            删除数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.BaseEntity`1.Restore">
+            <summary>
+            恢复删除的数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.BaseEntity`1.Update">
+            <summary>
+            更新数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.BaseEntity`1.Insert">
+            <summary>
+            插入数据
+            </summary>
+        </member>
+        <member name="M:FreeSql.BaseEntity`1.Save">
+            <summary>
+            更新或插入
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:FreeSql.BaseEntityAsync`2">
+            <summary>
+            包括 CreateTime/UpdateTime/IsDeleted、CRUD 异步方法、以及 ID 主键定义 的实体基类
+            <para></para>
+            当 TKey 为 int/long 时，Id 主键被设为自增值主键
+            </summary>
+            <typeparam name="TEntity"></typeparam>
+            <typeparam name="TKey"></typeparam>
+        </member>
+        <member name="P:FreeSql.BaseEntityAsync`2.Id">
+            <summary>
+            主键
+            </summary>
+        </member>
+        <member name="M:FreeSql.BaseEntityAsync`2.FindAsync(`1)">
+            <summary>
+            根据主键值获取数据
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
+        <member name="T:FreeSql.BaseEntityAsync`1">
+            <summary>
+            包括 CreateTime/UpdateTime/IsDeleted、以及 CRUD 异步方法的实体基类
+            </summary>
+            <typeparam name="TEntity"></typeparam>
+        </member>
+        <member name="M:FreeSql.BaseEntityAsync`1.DeleteAsync">
+            <summary>
+            删除数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.BaseEntityAsync`1.RestoreAsync">
+            <summary>
+            恢复删除的数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.BaseEntityAsync`1.UpdateAsync">
+            <summary>
+            更新数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.BaseEntityAsync`1.InsertAsync">
+            <summary>
+            插入数据
+            </summary>
+        </member>
+        <member name="M:FreeSql.BaseEntityAsync`1.SaveAsync">
+            <summary>
+            更新或插入
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="T:FreeSql.BaseEntity">
             <summary>
             包括 CreateTime/UpdateTime/IsDeleted 的实体基类
             </summary>
         </member>
-        <member name="P:BaseEntity.Orm">
+        <member name="P:FreeSql.BaseEntity.Orm">
             <summary>
             全局 IFreeSql orm 对象
             </summary>
         </member>
-        <member name="M:BaseEntity.Initialization(IFreeSql)">
+        <member name="M:FreeSql.BaseEntity.Initialization(IFreeSql)">
             <summary>
             初始化BaseEntity
             BaseEntity.Initialization(new FreeSqlBuilder()
@@ -27,54 +146,73 @@
             </summary>
             <param name="fsql">IFreeSql orm 对象</param>
         </member>
-        <member name="P:BaseEntity.CreateTime">
+        <member name="P:FreeSql.BaseEntity.CreateTime">
             <summary>
             创建时间
             </summary>
         </member>
-        <member name="P:BaseEntity.UpdateTime">
+        <member name="P:FreeSql.BaseEntity.UpdateTime">
             <summary>
             更新时间
             </summary>
         </member>
-        <member name="P:BaseEntity.IsDeleted">
+        <member name="P:FreeSql.BaseEntity.IsDeleted">
             <summary>
             逻辑删除
             </summary>
         </member>
-        <member name="M:BaseEntity.Begin">
+        <member name="P:FreeSql.BaseEntity.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
+        <member name="M:FreeSql.BaseEntity.Begin">
             <summary>
             开启工作单元事务
             </summary>
             <returns></returns>
         </member>
-        <member name="M:BaseEntity.Begin(System.Nullable{System.Data.IsolationLevel})">
+        <member name="M:FreeSql.BaseEntity.Begin(System.Nullable{System.Data.IsolationLevel})">
             <summary>
             开启工作单元事务
             </summary>
             <param name="level">事务等级</param>
             <returns></returns>
         </member>
-        <member name="T:BaseEntityAsync`1">
+        <member name="P:FreeSql.BaseEntity.CurrentTenantId">
             <summary>
-            包括 CreateTime/UpdateTime/IsDeleted、以及 CRUD 异步方法的实体基类
+            获取或设置当前租户id
             </summary>
-            <typeparam name="TEntity"></typeparam>
         </member>
-        <member name="P:BaseEntityAsync`1.Select">
+        <member name="T:FreeSql.ITenant">
+            <summary>
+            租户
+            </summary>
+        </member>
+        <member name="P:FreeSql.ITenant.TenantId">
+            <summary>
+            租户id
+            </summary>
+        </member>
+        <member name="P:FreeSql.BaseEntityReadOnly`1.Select">
             <summary>
             查询数据
             </summary>
             <returns></returns>
         </member>
-        <member name="M:BaseEntityAsync`1.Where(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
+        <member name="M:FreeSql.BaseEntityReadOnly`1.SetTenantId">
+            <summary>
+            设置当前租户id
+            </summary>
+        </member>
+        <member name="M:FreeSql.BaseEntityReadOnly`1.Where(System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
             <summary>
             查询条件，Where(a => a.Id > 10)，支持导航对象查询，Where(a => a.Author.Email == "2881099@qq.com")
             </summary>
             <param name="exp">lambda表达式</param>
             <returns></returns>
         </member>
-        <member name="M:BaseEntityAsync`1.WhereIf(System.Boolean,System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
+        <member name="M:FreeSql.BaseEntityReadOnly`1.WhereIf(System.Boolean,System.Linq.Expressions.Expression{System.Func{`0,System.Boolean}})">
             <summary>
             查询条件，Where(true, a => a.Id > 10)，支导航对象查询，Where(true, a => a.Author.Email == "2881099@qq.com")
             </summary>
@@ -82,131 +220,42 @@
             <param name="exp">lambda表达式</param>
             <returns></returns>
         </member>
-        <member name="P:BaseEntityAsync`1.Repository">
+        <member name="P:FreeSql.BaseEntityReadOnly`1.Repository">
             <summary>
             仓储对象
             </summary>
         </member>
-        <member name="M:BaseEntityAsync`1.Attach">
+        <member name="M:FreeSql.BaseEntityReadOnly`1.Attach">
             <summary>
             附加实体，在更新数据时，只更新变化的部分
             </summary>
         </member>
-        <member name="M:BaseEntityAsync`1.UpdateIsDeletedAsync(System.Boolean)">
-             async *
-        </member>
-        <member name="M:BaseEntityAsync`1.DeleteAsync">
+        <member name="T:FreeSql.BaseEntityTree`2">
             <summary>
-            删除数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:BaseEntityAsync`1.RestoreAsync">
-            <summary>
-            恢复删除的数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:BaseEntityAsync`1.UpdateAsync">
-            <summary>
-            更新数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:BaseEntityAsync`1.InsertAsync">
-            <summary>
-            插入数据
-            </summary>
-        </member>
-        <member name="M:BaseEntityAsync`1.SaveAsync">
-            <summary>
-            更新或插入
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="T:BaseEntityAsync`2">
-            <summary>
-            包括 CreateTime/UpdateTime/IsDeleted、CRUD 异步方法、以及 ID 主键定义 的实体基类
-            <para></para>
-            当 TKey 为 int/long 时，Id 主键被设为自增值主键
+            树状基类
             </summary>
             <typeparam name="TEntity"></typeparam>
             <typeparam name="TKey"></typeparam>
         </member>
-        <member name="P:BaseEntityAsync`2.Id">
+        <member name="P:FreeSql.BaseEntityTree`2.ParentId">
             <summary>
-            主键
+            父级id
             </summary>
         </member>
-        <member name="M:BaseEntityAsync`2.FindAsync(`1)">
+        <member name="P:FreeSql.BaseEntityTree`2.Childs">
             <summary>
-            根据主键值获取数据
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="T:BaseEntity`1">
-            <summary>
-            包括 CreateTime/UpdateTime/IsDeleted、以及 CRUD 异步和同步方法的实体基类
-            </summary>
-            <typeparam name="TEntity"></typeparam>
-        </member>
-        <member name="M:BaseEntity`1.Delete">
-            <summary>
-            删除数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:BaseEntity`1.Restore">
-            <summary>
-            恢复删除的数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:BaseEntity`1.Update">
-            <summary>
-            更新数据
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:BaseEntity`1.Insert">
-            <summary>
-            插入数据
+            下级列表
             </summary>
         </member>
-        <member name="M:BaseEntity`1.Save">
+        <member name="P:FreeSql.BaseEntityTree`2.Name">
             <summary>
-            更新或插入
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="T:BaseEntity`2">
-            <summary>
-            包括 CreateTime/UpdateTime/IsDeleted、CRUD 方法、以及 ID 主键定义 的实体基类
-            <para></para>
-            当 TKey 为 int/long 时，Id 主键被设为自增值主键
-            </summary>
-            <typeparam name="TEntity"></typeparam>
-            <typeparam name="TKey"></typeparam>
-        </member>
-        <member name="P:BaseEntity`2.Id">
-            <summary>
-            主键
+            名称
             </summary>
         </member>
-        <member name="M:BaseEntity`2.FindAsync(`1)">
+        <member name="P:FreeSql.BaseEntityTree`2.FullName">
             <summary>
-            根据主键值获取数据
+            名称：技术部-前端
             </summary>
-            <param name="id"></param>
-            <returns></returns>
-        </member>
-        <member name="M:BaseEntity`2.Find(`1)">
-            <summary>
-            根据主键值获取数据
-            </summary>
-            <param name="id"></param>
-            <returns></returns>
         </member>
     </members>
 </doc>