Browse Source

修复: 合并从develop

pull/313/head
yystopf 4 years ago
parent
commit
ad9bb8e542
2 changed files with 5 additions and 2 deletions
  1. +0
    -1
      app/controllers/users_controller.rb
  2. +5
    -1
      app/views/users/email_search.json.jbuilder

+ 0
- 1
app/controllers/users_controller.rb View File

@@ -305,7 +305,6 @@ class UsersController < ApplicationController
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


+ 5
- 1
app/views/users/email_search.json.jbuilder View File

@@ -1 +1,5 @@
json.partial! 'users/user', locals: { user: @user }
if @user.present?
json.partial! 'users/user', locals: { user: @user }
else
json.null
end

Loading…
Cancel
Save