From 94de47a01006270057d003ebe9ad07489acfc970 Mon Sep 17 00:00:00 2001
From: tone <3341154833@qq.com>
Date: Sun, 18 May 2025 21:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=BD=AF=E5=88=A0=E9=99=A4=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E8=BF=9B=E8=A1=8C=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tone-page-server/src/auth/auth.service.ts | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/tone-page-server/src/auth/auth.service.ts b/tone-page-server/src/auth/auth.service.ts
index 75262d0..c28b843 100644
--- a/tone-page-server/src/auth/auth.service.ts
+++ b/tone-page-server/src/auth/auth.service.ts
@@ -25,7 +25,13 @@ export class AuthService {
             { email: account },
             { phone: account },
             { username: account },
-        ]);
+        ], {
+            withDeleted: true,
+        });
+
+        if (user && user.deletedAt !== null) {
+            throw new BadRequestException('该账号注销中');
+        }
 
         if (user === null || !user.password_hash || !user.salt) {
             throw new BadRequestException('账户或密码错误');
@@ -61,7 +67,11 @@ export class AuthService {
         }
 
         // 判断用户是否存在，若不存在则进行注册
-        let user = await this.userService.findOne({ phone });
+        let user = await this.userService.findOne({ phone }, { withDeleted: true });
+        if (user && user.deletedAt !== null) {
+            throw new BadRequestException('该账号注销中，请使用其他手机号');
+        }
+
         if (!user) {
             // 执行注册操作
             user = await this.userService.create({ phone: phone });
@@ -95,7 +105,11 @@ export class AuthService {
         }
 
         // 判断用户是否存在，若不存在则进行注册
-        let user = await this.userService.findOne({ email });
+        let user = await this.userService.findOne({ email }, { withDeleted: true });
+        if (user && user.deletedAt !== null) {
+            throw new BadRequestException('该账号注销中，请使用其他邮箱');
+        }
+
         if (!user) {
             // 执行注册操作
             user = await this.userService.create({ email: email });