marking
/
WGShare.API
19
0
Fork 0
Code Pull Requests Actions Releases 3 Activity

判断账号是否存在，排除假删除的用户

This commit is contained in:
youngq 2024-10-14 17:41:56 +08:00
parent c09017455a
commit d28791558d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WGShare.API/Controllers/Backend/UserController.cs
View File

@ -72,7 +72,7 @@ namespace WGShare.API.Controllers.Backend
var entity = userInput.Adapt<User>();
entity.ScreenShareId = UserShareIdHelper.GenerateUnique8DigitNumber();
if (await _sqlSugar.Queryable<User>().AnyAsync(x => x.Account == entity.Account))
if (await _sqlSugar.Queryable<User>().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<User>();
if (await _sqlSugar.Queryable<User>().AnyAsync(x => x.Account == entity.Account && x.Id != inputDTO.Id))
if (await _sqlSugar.Queryable<User>().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<User>()
.Where(x => distinctAccount.Contains(x.Account))
.Where(x => distinctAccount.Contains(x.Account) && x.IsDelete == false)
.Select(x => x.Account)
.ToListAsync();
if (!existsAccount.IsNullOrEmpty())

8
WGShare.API/Controllers/Frontend/UserController.cs
View File

@ -88,7 +88,7 @@ namespace WGShare.API.Controllers.Frontend
user.TenantId = TenantId;
user.ScreenShareId = UserShareIdHelper.GenerateUnique8DigitNumber();
if (await _sqlSugar.Queryable<User>().AnyAsync(x => x.Account == user.Account))
if (await _sqlSugar.Queryable<User>().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<User>();
if (await _sqlSugar.Queryable<User>().AnyAsync(x => x.Account == entity.Account && x.Id != inputDTO.Id))
if (await _sqlSugar.Queryable<User>().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<User>()
.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();