!1536 配置假删除过滤器引发的异常,未找到解决方案，只能先修改继承的基类

Merge pull request !1536 from 冰魄少年/next

Admin.NET/Admin.NET.Core/Entity/SysUserLdap.cs

@@ -13,7 +13,7 @@ namespace Admin.NET.Core;
 [SysTable]
 [SugarIndex("index_{table}_A", nameof(Account), OrderByType.Asc)]
 [SugarIndex("index_{table}_U", nameof(UserId), OrderByType.Asc)]
-public class SysUserLdap : EntityTenant
+public class SysUserLdap : EntityTenantId
 {
     /// <summary>
     /// 用户Id

Admin.NET/Admin.NET.Core/Service/Auth/SysLdapService.cs

@@ -216,6 +216,7 @@ public class SysLdapService : IDynamicApiController, ITransient
                 {
                     var sysUserLdap = CreateSysUserLdap(attrs, sysLdap.BindAttrAccount, sysLdap.BindAttrEmployeeId, deptCode);
                     sysUserLdap.Dn = ldapEntry.Dn;
+                    sysUserLdap.TenantId=sysLdap.TenantId;
                     userLdapList.Add(sysUserLdap);
                 }
             }
@@ -313,6 +314,7 @@ public class SysLdapService : IDynamicApiController, ITransient
             {
                 var sysUserLdap = CreateSysUserLdap(attrs, sysLdap.BindAttrAccount, sysLdap.BindAttrEmployeeId, deptCode);
                 sysUserLdap.Dn = ldapEntry.Dn;
+                sysUserLdap.TenantId = sysLdap.TenantId;
                 if (string.IsNullOrEmpty(sysUserLdap.EmployeeId)) continue;
                 userLdapList.Add(sysUserLdap);
             }

Admin.NET/Admin.NET.Core/Service/User/SysUserLdapService.cs

@@ -33,7 +33,7 @@ public class SysUserLdapService : ITransient
         await _sysUserLdapRep.AsUpdateable()
             .InnerJoin<SysUser>((l, u) => l.EmployeeId == u.Account)
             .SetColumns((l, u) => new SysUserLdap { UserId = u.Id })
-            .Where((l, u) => l.TenantId == tenantId && u.Status == StatusEnum.Enable && u.IsDelete == false && l.IsDelete == false)
+            .Where((l, u) => l.TenantId == tenantId && u.Status == StatusEnum.Enable && u.IsDelete == false)
             .ExecuteCommandAsync();
     }
 
@@ -47,7 +47,7 @@ public class SysUserLdapService : ITransient
     /// <returns></returns>
     public async Task AddUserLdap(long tenantId, long userId, string account, string domainAccount)
     {
-        var userLdap = await _sysUserLdapRep.GetFirstAsync(u => u.TenantId == tenantId && u.IsDelete == false && (u.Account == account || u.UserId == userId || u.EmployeeId == domainAccount));
+        var userLdap = await _sysUserLdapRep.GetFirstAsync(u => u.TenantId == tenantId && (u.Account == account || u.UserId == userId || u.EmployeeId == domainAccount));
         if (userLdap != null) await _sysUserLdapRep.DeleteByIdAsync(userLdap.Id);
 
         if (!string.IsNullOrWhiteSpace(domainAccount))