From f9ddd46f595942fd2c92260bde1ce4a3cc50addb Mon Sep 17 00:00:00 2001
From: EasyChen <easychen@qq.com>
Date: Mon, 24 Jan 2022 13:49:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B4=A6=E5=8F=B7=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E9=80=BB=E8=BE=91=EF=BC=8C=E9=99=90=E5=88=B6=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=90=88=E5=B9=B6=E8=B4=A6=E5=8F=B7=E8=87=AA=E5=B7=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/Http/Controllers/PushDeerUserController.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/api/app/Http/Controllers/PushDeerUserController.php b/api/app/Http/Controllers/PushDeerUserController.php
index e968ced..cdac01e 100644
--- a/api/app/Http/Controllers/PushDeerUserController.php
+++ b/api/app/Http/Controllers/PushDeerUserController.php
@@ -192,14 +192,19 @@ class PushDeerUserController extends Controller
             return send_error('错误的token 或者 code', ErrorCode('ARGS'));
         }
 
+        $user2delete = PushDeerUser::where($type_field, $identiy_string)->get()->first();
+
         // 更新对应的字段到当前用户
         $current_user = PushDeerUser::where('id', uid())->get()->first();
+
+        if ($user2delete && $user2delete['id'] == $current_user['id']) {
+            return send_error("不能合并当前账号本身", ErrorCode('ARGS'));
+        }
+
         $current_user[$type_field] = $identiy_string;
         $current_user->save();
 
         // 如果存在旧用户，合并并删除
-        $user2delete = PushDeerUser::where($type_field, $identiy_string)->get()->first();
-
         if ($user2delete) {
             // 删除Key
             PushDeerKey::where('uid', $user2delete['id'])->delete();