diff --git a/WGShare.API/Controllers/Backend/UserController.cs b/WGShare.API/Controllers/Backend/UserController.cs index c3b9ea1..f693ebe 100644 --- a/WGShare.API/Controllers/Backend/UserController.cs +++ b/WGShare.API/Controllers/Backend/UserController.cs @@ -72,7 +72,7 @@ namespace WGShare.API.Controllers.Backend var entity = userInput.Adapt(); entity.ScreenShareId = UserShareIdHelper.GenerateUnique8DigitNumber(); - if (await _sqlSugar.Queryable().AnyAsync(x => x.Account == entity.Account)) + if (await _sqlSugar.Queryable().AnyAsync(x => x.Account == entity.Account && x.IsDelete == false)) { throw Oops.Oh("账号已存在!"); } @@ -85,7 +85,7 @@ namespace WGShare.API.Controllers.Backend { var entity = inputDTO.Adapt(); - if (await _sqlSugar.Queryable().AnyAsync(x => x.Account == entity.Account && x.Id != inputDTO.Id)) + if (await _sqlSugar.Queryable().AnyAsync(x => x.Account == entity.Account && x.Id != inputDTO.Id && x.IsDelete == false)) { throw Oops.Oh("账号已存在!"); } @@ -153,7 +153,7 @@ namespace WGShare.API.Controllers.Backend // 数据库重复账号检查 var existsAccount = await _sqlSugar.Queryable() - .Where(x => distinctAccount.Contains(x.Account)) + .Where(x => distinctAccount.Contains(x.Account) && x.IsDelete == false) .Select(x => x.Account) .ToListAsync(); if (!existsAccount.IsNullOrEmpty()) diff --git a/WGShare.API/Controllers/Frontend/UserController.cs b/WGShare.API/Controllers/Frontend/UserController.cs index f0fa8eb..0237eb2 100644 --- a/WGShare.API/Controllers/Frontend/UserController.cs +++ b/WGShare.API/Controllers/Frontend/UserController.cs @@ -88,7 +88,7 @@ namespace WGShare.API.Controllers.Frontend user.TenantId = TenantId; user.ScreenShareId = UserShareIdHelper.GenerateUnique8DigitNumber(); - if (await _sqlSugar.Queryable().AnyAsync(x => x.Account == user.Account)) + if (await _sqlSugar.Queryable().AnyAsync(x => x.Account == user.Account && x.IsDelete == false)) { throw Oops.Oh("账号已存在!"); } @@ -106,7 +106,7 @@ namespace WGShare.API.Controllers.Frontend { var entity = inputDTO.Adapt(); - if (await _sqlSugar.Queryable().AnyAsync(x => x.Account == entity.Account && x.Id != inputDTO.Id)) + if (await _sqlSugar.Queryable().AnyAsync(x => x.Account == entity.Account && x.Id != inputDTO.Id && x.IsDelete == false)) { throw Oops.Oh("账号已存在!"); } @@ -183,7 +183,7 @@ namespace WGShare.API.Controllers.Frontend // 数据库重复账号检查 var existsAccount = await _sqlSugar.Queryable() - .Where(x => distinctAccount.Contains(x.Account)) + .Where(x => distinctAccount.Contains(x.Account) && x.IsDelete == false) .Select(x => x.Account) .ToListAsync(); if (!existsAccount.IsNullOrEmpty()) @@ -233,7 +233,7 @@ namespace WGShare.API.Controllers.Frontend x.RoleId = roleId; if (string.IsNullOrWhiteSpace(x.SubjectName)) - x.Subject = SubjectType.All; + x.Subject = SubjectType.All; }); await _sqlSugar.Insertable(users).ExecuteCommandAsync();