修复分布式事务未触发的问题

src/platform/ZhonTai.Admin/Core/Attributes/TransactionAttribute.cs

@@ -1,6 +1,7 @@
 using FreeSql;
 using System;
 using System.Data;
+using ZhonTai.Admin.Core.Consts;
 
 namespace ZhonTai.Admin.Core.Attributes;
 
@@ -23,6 +24,6 @@ public class TransactionAttribute : Attribute
     /// <summary>
     /// 数据库键
     /// </summary>
-    public string DbKey { get; set; }
+    public string DbKey { get; set; } = DbKeys.MasterDbKey;
 
 }

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

@@ -82,5 +82,5 @@ public partial class UserEntity : EntityFull, ITenant
     /// 员工
     /// </summary>
     [Navigate(nameof(Id))]
-    public StaffEntity Emp { get; set; }
+    public StaffEntity Staff { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Api/ApiService.cs

@@ -160,7 +160,7 @@ public class ApiService : BaseService, IApiService, IDynamicApi
     /// <param name="input"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> SyncAsync(ApiSyncInput input)
+    public virtual async Task<IResultOutput> SyncAsync(ApiSyncInput input)
     {
         //查询所有api
         var apis = await _apiRepository.Select.ToListAsync();

src/platform/ZhonTai.Admin/Services/Api/Dto/ApiAddInput.cs

@@ -8,7 +8,7 @@ public class ApiAddInput
     /// <summary>
     /// 所属模块
     /// </summary>
-		public long? ParentId { get; set; }
+	public long? ParentId { get; set; }
 
     /// <summary>
     /// 接口名称

src/platform/ZhonTai.Admin/Services/Api/Dto/ApiListOutput.cs

@@ -10,7 +10,7 @@ public class ApiListOutput
     /// <summary>
     /// 接口父级
     /// </summary>
-		public long? ParentId { get; set; }
+	public long? ParentId { get; set; }
 
     /// <summary>
     /// 接口命名

src/platform/ZhonTai.Admin/Services/Dictionary/Dto/DictionaryAddInput.cs

@@ -33,5 +33,5 @@ public class DictionaryAddInput
     /// <summary>
     /// 启用
     /// </summary>
-		public bool Enabled { get; set; }
+	public bool Enabled { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Dictionary/Dto/DictionaryListOutput.cs

@@ -25,5 +25,5 @@ public class DictionaryListOutput
     /// <summary>
     /// 启用
     /// </summary>
-		public bool Enabled { get; set; }
+	public bool Enabled { get; set; }
 }

src/platform/ZhonTai.Admin/Services/DictionaryType/DictionaryTypeService.cs

@@ -106,7 +106,7 @@ public class DictionaryTypeService : BaseService, IDictionaryTypeService, IDynam
     /// <param name="id"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> DeleteAsync(long id)
+    public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
         //删除字典数据
         await _dictionaryRepository.DeleteAsync(a => a.DictionaryTypeId == id);
@@ -123,7 +123,7 @@ public class DictionaryTypeService : BaseService, IDictionaryTypeService, IDynam
     /// <param name="id"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> SoftDeleteAsync(long id)
+    public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     {
         await _dictionaryRepository.SoftDeleteAsync(a => a.DictionaryTypeId == id);
         await _DictionaryTypeRepository.SoftDeleteAsync(id);
@@ -137,7 +137,7 @@ public class DictionaryTypeService : BaseService, IDictionaryTypeService, IDynam
     /// <param name="ids"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
+    public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     {
         await _dictionaryRepository.SoftDeleteAsync(a => ids.Contains(a.DictionaryTypeId));
         await _DictionaryTypeRepository.SoftDeleteAsync(ids);

src/platform/ZhonTai.Admin/Services/DictionaryType/Dto/DictionaryTypeAddInput.cs

@@ -23,5 +23,5 @@ public class DictionaryTypeAddInput
     /// <summary>
     /// 启用
     /// </summary>
-		public bool Enabled { get; set; }
+	public bool Enabled { get; set; }
 }

src/platform/ZhonTai.Admin/Services/DictionaryType/Dto/DictionaryTypeListOutput.cs

@@ -20,5 +20,5 @@ public class DictionaryTypeListOutput
     /// <summary>
     /// 启用
     /// </summary>
-		public bool Enabled { get; set; }
+	public bool Enabled { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Org/Input/OrgAddInput.cs

@@ -8,7 +8,7 @@ public class OrgAddInput
     /// <summary>
     /// 父级
     /// </summary>
-		public long ParentId { get; set; }
+	public long ParentId { get; set; }
 
     /// <summary>
     /// 名称
@@ -43,5 +43,5 @@ public class OrgAddInput
     /// <summary>
     /// 启用
     /// </summary>
-		public bool Enabled { get; set; }
+	public bool Enabled { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddApiInput.cs

@@ -37,7 +37,7 @@ public class PermissionAddApiInput
     /// <summary>
     /// 隐藏
     /// </summary>
-		public bool Hidden { get; set; }
+	public bool Hidden { get; set; }
 
     ///// <summary>
     ///// 启用

src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddGroupInput.cs

@@ -27,7 +27,7 @@ public class PermissionAddGroupInput
     /// <summary>
     /// 隐藏
     /// </summary>
-		public bool Hidden { get; set; }
+	public bool Hidden { get; set; }
 
     ///// <summary>
     ///// 启用

src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionAddMenuInput.cs

@@ -37,7 +37,7 @@ public class PermissionAddMenuInput
     /// <summary>
     /// 隐藏
     /// </summary>
-		public bool Hidden { get; set; }
+	public bool Hidden { get; set; }
 
     ///// <summary>
     ///// 启用

src/platform/ZhonTai.Admin/Services/Permission/Dto/PermissionListOutput.cs

@@ -52,10 +52,10 @@ public class PermissionListOutput
     /// <summary>
     /// 隐藏
     /// </summary>
-		public bool Hidden { get; set; }
+	public bool Hidden { get; set; }
 
     /// <summary>
     /// 启用
     /// </summary>
-		public bool Enabled { get; set; }
+	public bool Enabled { get; set; }
 }

src/platform/ZhonTai.Admin/Services/Permission/PermissionService.cs

@@ -260,7 +260,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
     /// <param name="input"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> AddDotAsync(PermissionAddDotInput input)
+    public virtual async Task<IResultOutput> AddDotAsync(PermissionAddDotInput input)
     {
         var entity = Mapper.Map<PermissionEntity>(input);
         var id = (await _permissionRepository.InsertAsync(entity)).Id;
@@ -334,7 +334,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
     /// <param name="input"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> UpdateDotAsync(PermissionUpdateDotInput input)
+    public virtual async Task<IResultOutput> UpdateDotAsync(PermissionUpdateDotInput input)
     {
         if (!(input?.Id > 0))
         {
@@ -370,7 +370,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
     /// <param name="id"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> DeleteAsync(long id)
+    public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
         //递归查询所有权限点
         var ids = _permissionRepository.Select
@@ -418,7 +418,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
     /// <param name="input"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> AssignAsync(PermissionAssignInput input)
+    public virtual async Task<IResultOutput> AssignAsync(PermissionAssignInput input)
     {
         //分配权限的时候判断角色是否存在
         var exists = await _roleRepository.Select.DisableGlobalFilter("Tenant").WhereDynamic(input.RoleId).AnyAsync();
@@ -479,7 +479,7 @@ public class PermissionService : BaseService, IPermissionService, IDynamicApi
     /// <param name="input"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> SaveTenantPermissionsAsync(PermissionSaveTenantPermissionsInput input)
+    public virtual async Task<IResultOutput> SaveTenantPermissionsAsync(PermissionSaveTenantPermissionsInput input)
     {
         //获得租户db
         var cloud = ServiceProvider.GetRequiredService<FreeSqlCloud>();

src/platform/ZhonTai.Admin/Services/Role/RoleService.cs

@@ -195,7 +195,7 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
     /// <param name="id"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> DeleteAsync(long id)
+    public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
         await _userRoleRepository.DeleteAsync(a => a.UserId == id);
         await _rolePermissionRepository.DeleteAsync(a => a.RoleId == id);
@@ -210,7 +210,7 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
     /// <param name="ids"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> BatchDeleteAsync(long[] ids)
+    public virtual async Task<IResultOutput> BatchDeleteAsync(long[] ids)
     {
         await _userRoleRepository.DeleteAsync(a => ids.Contains(a.RoleId));
         await _rolePermissionRepository.DeleteAsync(a => ids.Contains(a.RoleId));
@@ -225,7 +225,7 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
     /// <param name="id"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> SoftDeleteAsync(long id)
+    public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     {
         await _userRoleRepository.DeleteAsync(a => a.RoleId == id);
         await _rolePermissionRepository.DeleteAsync(a => a.RoleId == id);
@@ -240,7 +240,7 @@ public class RoleService : BaseService, IRoleService, IDynamicApi
     /// <param name="ids"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
+    public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     {
         await _userRoleRepository.DeleteAsync(a => ids.Contains(a.RoleId));
         await _rolePermissionRepository.DeleteAsync(a => ids.Contains(a.RoleId));

src/platform/ZhonTai.Admin/Services/Tenant/Dto/TenantAddInput.cs

@@ -55,7 +55,7 @@ public class TenantAddInput
     /// <summary>
     /// 启用
     /// </summary>
-		public bool Enabled { get; set; }
+	public bool Enabled { get; set; }
 
     /// <summary>
     /// 说明

src/platform/ZhonTai.Admin/Services/Tenant/Dto/TenantListOutput.cs

@@ -80,7 +80,7 @@ public class TenantListOutput
     /// <summary>
     /// 启用
     /// </summary>
-		public bool Enabled { get; set; }
+	public bool Enabled { get; set; }
 
     /// <summary>
     /// 说明

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

@@ -98,7 +98,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     /// <param name="input"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> AddAsync(TenantAddInput input)
+    public virtual async Task<IResultOutput> AddAsync(TenantAddInput input)
     {
         //添加租户
         var entity = Mapper.Map<TenantEntity>(input);
@@ -199,7 +199,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     /// <param name="id"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> DeleteAsync(long id)
+    public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
         //删除角色权限
         await _rolePermissionRepository.Where(a => a.Role.TenantId == id).DisableGlobalFilter("Tenant").ToDelete().ExecuteAffrowsAsync();
@@ -225,7 +225,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     /// <param name="id"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> SoftDeleteAsync(long id)
+    public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     {
         //删除用户
         await _userRepository.SoftDeleteAsync(a => a.TenantId == id, "Tenant");
@@ -245,7 +245,7 @@ public class TenantService : BaseService, ITenantService, IDynamicApi
     /// <param name="ids"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
+    public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     {
         //删除用户
         await _userRepository.SoftDeleteAsync(a => ids.Contains(a.TenantId.Value), "Tenant");

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

@@ -55,7 +55,7 @@ public partial class UserUpdateInput
     /// <summary>
     /// 员工信息
     /// </summary>
-    public StaffUpdateInput Emp { get; set; }
+    public StaffUpdateInput Staff { get; set; }
 
     /// <summary>
     /// 版本

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

@@ -57,7 +57,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
         var output = await _userRepository.Select
         .WhereDynamic(id)
         .IncludeMany(a => a.Roles.Select(b => new RoleEntity { Id = b.Id, Name = b.Name }))
-        .IncludeMany(a => a.Emp.Orgs.Select(b => new OrgEntity { Id = b.Id, Name = b.Name }))
+        .IncludeMany(a => a.Staff.Orgs.Select(b => new OrgEntity { Id = b.Id, Name = b.Name }))
         .ToOneAsync(a=>new
         {
             a.Id,
@@ -67,11 +67,11 @@ public class UserService : BaseService, IUserService, IDynamicApi
             a.Mobile,
             a.Email,
             a.Roles,
-            Emp = new
+            Staff = new
             {
-                a.Emp.Version,
-                a.Emp.MainOrgId,
-                a.Emp.Orgs
+                a.Staff.Version,
+                a.Staff.Orgs,
+                a.Staff.MainOrgId
             }
         });
 
@@ -87,7 +87,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     public async Task<IResultOutput> GetPageAsync(PageInput<long?> input)
     {
         var list = await _userRepository.Select
-        .WhereIf(input.Filter.HasValue && input.Filter > 0, a=>a.Emp.MainOrgId == input.Filter)
+        .WhereIf(input.Filter.HasValue && input.Filter > 0, a=>a.Staff.MainOrgId == input.Filter)
         .WhereDynamicFilter(input.DynamicFilter)
         .Count(out var total)
         .OrderByDescending(true, a => a.Id)
@@ -165,7 +165,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// <param name="input"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> AddAsync(UserAddInput input)
+    public virtual async Task<IResultOutput> AddAsync(UserAddInput input)
     {
         if (await _userRepository.Select.AnyAsync(a => a.UserName == input.UserName))
         {
@@ -230,7 +230,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// <param name="input"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> UpdateAsync(UserUpdateInput input)
+    public virtual async Task<IResultOutput> UpdateAsync(UserUpdateInput input)
     {
         var user = await _userRepository.GetAsync(input.Id);
         if (!(user?.Id > 0))
@@ -265,23 +265,23 @@ public class UserService : BaseService, IUserService, IDynamicApi
         }
 
         // 员工信息
-        var emp = await _staffRepository.GetAsync(user.Id);
-        if(emp == null)
+        var staff = await _staffRepository.GetAsync(user.Id);
+        if(staff == null)
         {
-            emp = new StaffEntity();
+            staff = new StaffEntity();
         }
-        Mapper.Map(input.Emp, emp);
-        emp.Id = user.Id;
+        Mapper.Map(input.Staff, staff);
+        staff.Id = user.Id;
 
-        await _staffRepository.InsertOrUpdateAsync(emp);
+        await _staffRepository.InsertOrUpdateAsync(staff);
 
         //所属部门
-        await _staffOrgRepository.DeleteAsync(a => a.StaffId == emp.Id);
-        if (input.Emp.OrgIds != null && input.Emp.OrgIds.Any())
+        await _staffOrgRepository.DeleteAsync(a => a.StaffId == staff.Id);
+        if (input.Staff.OrgIds != null && input.Staff.OrgIds.Any())
         {
-            var orgs = input.Emp.OrgIds.Select(orgId => new StaffOrgEntity
+            var orgs = input.Staff.OrgIds.Select(orgId => new StaffOrgEntity
             {
-                StaffId = emp.Id,
+                StaffId = staff.Id,
                 OrgId = orgId
             });
             await _staffOrgRepository.InsertAsync(orgs);
@@ -340,7 +340,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// <param name="id"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> DeleteAsync(long id)
+    public virtual async Task<IResultOutput> DeleteAsync(long id)
     {
         //删除员工所属部门
         await _staffOrgRepository.DeleteAsync(a => a.StaffId == id);
@@ -360,7 +360,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// <param name="ids"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> BatchDeleteAsync(long[] ids)
+    public virtual async Task<IResultOutput> BatchDeleteAsync(long[] ids)
     {
         //删除员工所属部门
         await _staffOrgRepository.DeleteAsync(a => ids.Contains(a.StaffId));
@@ -380,7 +380,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// <param name="id"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> SoftDeleteAsync(long id)
+    public virtual async Task<IResultOutput> SoftDeleteAsync(long id)
     {
         await _staffOrgRepository.DeleteAsync(a => a.StaffId == id);
         await _staffRepository.SoftDeleteAsync(a => a.Id == id);
@@ -396,7 +396,7 @@ public class UserService : BaseService, IUserService, IDynamicApi
     /// <param name="ids"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
+    public virtual async Task<IResultOutput> BatchSoftDeleteAsync(long[] ids)
     {
         await _staffOrgRepository.DeleteAsync(a => ids.Contains(a.StaffId));
         await _staffRepository.SoftDeleteAsync(a => ids.Contains(a.Id));

src/platform/ZhonTai.Admin/Services/View/Dto/ViewAddInput.cs

@@ -8,7 +8,7 @@ public class ViewAddInput
     /// <summary>
     /// 所属节点
     /// </summary>
-		public long? ParentId { get; set; }
+	public long? ParentId { get; set; }
 
     /// <summary>
     /// 视图命名

src/platform/ZhonTai.Admin/Services/View/ViewService.cs

@@ -134,7 +134,7 @@ public class ViewService : BaseService, IViewService, IDynamicApi
     /// <param name="input"></param>
     /// <returns></returns>
     [Transaction]
-    public async Task<IResultOutput> SyncAsync(ViewSyncInput input)
+    public virtual async Task<IResultOutput> SyncAsync(ViewSyncInput input)
     {
         //查询所有视图
         var views = await _viewRepository.Select.ToListAsync();

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

@@ -2509,7 +2509,7 @@
             角色列表
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Domain.User.UserEntity.Emp">
+        <member name="P:ZhonTai.Admin.Domain.User.UserEntity.Staff">
             <summary>
             员工
             </summary>
@@ -5319,7 +5319,7 @@
             状态
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserUpdateInput.Emp">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserUpdateInput.Staff">
             <summary>
             员工信息
             </summary>