|
|
@@ -141,8 +141,7 @@ public class SysUserService : IDynamicApiController, ITransient
|
|
|
[NonAction]
|
|
|
public virtual async Task<long> RegisterUser(AddUserInput input)
|
|
|
{
|
|
|
- var query = _sysUserRep.AsQueryable().ClearFilter()
|
|
|
- .Where(u => u.Id != input.Id && (u.TenantId == _userManager.TenantId || u.AccountType == AccountTypeEnum.SuperAdmin));
|
|
|
+ var query = _sysUserRep.AsQueryable().ClearFilter().Where(u => u.TenantId == _userManager.TenantId || u.AccountType == AccountTypeEnum.SuperAdmin);
|
|
|
|
|
|
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);
|
|
|
@@ -187,8 +186,8 @@ 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 && (u.TenantId == _userManager.TenantId || u.AccountType == AccountTypeEnum.SuperAdmin));
|
|
|
|
|
|
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);
|