修复: 合并从develop

This commit is contained in:
2022-05-24 17:27:24 +08:00
4 changed files with 10 additions and 2 deletions

View File

@@ -302,6 +302,12 @@ class UsersController < ApplicationController
end
end
def email_search
return render_error('请输入email') if params[:email].blank?
@user = User.find_by(mail: params[:email])
return render_not_found unless @user.present?
end
private
def load_user
@user = User.find_by_login(params[:id]) || User.find_by(id: params[:id])
@@ -391,4 +397,4 @@ class UsersController < ApplicationController
successful_authentication(user) if user.present?
end
end
end