From d28791558dba2339383ab61663de47f2e37cf44d Mon Sep 17 00:00:00 2001
From: youngq <yq5537@outlook.com>
Date: Mon, 14 Oct 2024 17:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=B4=A6=E5=8F=B7=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=EF=BC=8C=E6=8E=92=E9=99=A4=E5=81=87?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WGShare.API/Controllers/Backend/UserController.cs  | 6 +++---
 WGShare.API/Controllers/Frontend/UserController.cs | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

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<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())
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<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();