From c8fdbd577352c7248fa42d85b30e9671b61cd590 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Wed, 30 Jul 2025 18:20:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/UserController.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/controller/UserController.php b/app/controller/UserController.php
index 982ef6f..a539171 100644
--- a/app/controller/UserController.php
+++ b/app/controller/UserController.php
@@ -338,16 +338,24 @@ class UserController
         $email = Util::getParam($request, 'email');
         $code = Util::getParam($request, 'code');
         $verification_code = Redis::get("verification_code:{$email}");
-        $id = $request->user['id'];
+        $id = $request->user->uid;
 
         if ($code != $verification_code) {
             return Util::fail([], trans('code_error'));
         }
 
-        $res = User::where('id', $id)
+//        $res = User::where('id', $id)
+//            ->first();
+//        if($res['email'] != $email) {
+//            return Util::fail([], trans('email_consistent'));
+//        }
+
+        $user = User::where('status', 0)
+//            ->where('corp_id', $corpId)
+            ->OrWhere(['email' => $request->post('email'),'phone' => $request->post('email')])
             ->first();
-        if($res['email'] != $email) {
-            return Util::fail([], trans('email_consistent'));
+        if(!$user) {
+            return Util::fail([], trans('user_none'));
         }
 
         //加密