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')); } //加密