yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change User find_by errors

This commit is contained in:
sylor_huang@126.com 2020-10-15 13:59:03 +08:00
parent 5ae9c9bebc
commit 598571e8f4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/users_service.rb
View File

@ -20,7 +20,7 @@ class UsersService
end end
def edit_brief params, current_user def edit_brief params, current_user
target_user = User.find(params[:login]) target_user = User.find_by(login: params[:login])
return {status: -1, message: "请输入内容"} if params[:content].blank? return {status: -1, message: "请输入内容"} if params[:content].blank?
return {status: -1, message: "请登录"} unless current_user.present? return {status: -1, message: "请登录"} unless current_user.present?
return {status: -1, message: "您没有权限操作"} unless current_user.login == params[:login] return {status: -1, message: "您没有权限操作"} unless current_user.login == params[:login]
@ -85,7 +85,7 @@ class UsersService
end end
def block_user params, current_user def block_user params, current_user
target_user = User.find(params[:login]) target_user = User.find_by(login:params[:login])
return {status: -1, message: "请选择屏蔽类型"} unless params[:block].present? return {status: -1, message: "请选择屏蔽类型"} unless params[:block].present?
return {status: -1, message: "请登录"} unless current_user.present? return {status: -1, message: "请登录"} unless current_user.present?
return {status: -1, message: "用户不存在"} unless target_user.present? return {status: -1, message: "用户不存在"} unless target_user.present?
@ -104,7 +104,7 @@ class UsersService
end end
def watch_user params, current_user def watch_user params, current_user
target_user = User.find(params[:login]) target_user = User.find_by(login:params[:login])
return {status: -1, message: "请选择关注类型"} unless params[:watch].present? return {status: -1, message: "请选择关注类型"} unless params[:watch].present?
return {status: -1, message: "请登录"} unless current_user.try(:login).present? return {status: -1, message: "请登录"} unless current_user.try(:login).present?
return {status: -1, message: "用户不存在"} unless target_user.present? return {status: -1, message: "用户不存在"} unless target_user.present?
@ -126,7 +126,7 @@ class UsersService
def user_projects params, current_user def user_projects params, current_user
return {status: -1, message: "请登录"} unless current_user.present? return {status: -1, message: "请登录"} unless current_user.present?
target_user = User.find(params[:login]) target_user = User.find_by(login:params[:login])
show_all = params[:login] == current_user&.login || current_user&.admin? show_all = params[:login] == current_user&.login || current_user&.admin?
select_type = params[:type] || "p_project" select_type = params[:type] || "p_project"
order = params[:order] || "desc" order = params[:order] || "desc"