Bladeren bron

!1649 update Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs.
Merge pull request !1649 from Lzh666/N/A

zuohuaijun 1 jaar geleden
bovenliggende
commit
170fa960e1
1 gewijzigde bestanden met toevoegingen van 2 en 3 verwijderingen
  1. 2 3
      Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

+ 2 - 3
Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -138,7 +138,7 @@ public class SysUserService : IDynamicApiController, ITransient
     [NonAction]
     public virtual async Task<long> RegisterUser(AddUserInput input)
     {
-        var query = _sysUserRep.AsQueryable().ClearFilter().Where(u => u.TenantId == input.TenantId || u.AccountType == AccountTypeEnum.SuperAdmin);
+        var query = _sysUserRep.AsQueryable().ClearFilter();
 
         if (await query.AnyAsync(u => u.Account == input.Account)) throw Oops.Oh(ErrorCodeEnum.D1003);
         if (!string.IsNullOrWhiteSpace(input.Phone) && await query.AnyAsync(u => u.Phone == input.Phone)) throw Oops.Oh(ErrorCodeEnum.D1032);
@@ -180,8 +180,7 @@ public class SysUserService : IDynamicApiController, ITransient
     public virtual async Task UpdateUser(UpdateUserInput input)
     {
         // 是否租户隔离登录验证
-        var query = _sysUserRep.AsQueryable().ClearFilter().Where(u => u.Id != input.Id)
-            .Where(u => u.TenantId == _userManager.TenantId || u.AccountType == AccountTypeEnum.SuperAdmin);
+        var query = _sysUserRep.AsQueryable().ClearFilter().Where(u => u.Id != input.Id);
 
         if (await query.AnyAsync(u => u.Account == input.Account)) throw Oops.Oh(ErrorCodeEnum.D1003);
         if (!string.IsNullOrWhiteSpace(input.Phone) && await query.AnyAsync(u => u.Phone == input.Phone)) throw Oops.Oh(ErrorCodeEnum.D1032);