forked from Trustie/forgeplus
修复:查询使用关联查询
This commit is contained in:
parent
c4881e28ed
commit
494ba11e26
|
|
@ -9,7 +9,7 @@ class Admins::UserActionsController < Admins::BaseController
|
|||
end
|
||||
keyword = params[:keyword].to_s.strip.presence
|
||||
if keyword
|
||||
sql = 'users.login LIKE :keyword OR users.phone LIKE :keyword OR users.mail LIKE :keyword'
|
||||
sql = 'users.login LIKE :keyword OR users.phone LIKE :keyword OR users.mail LIKE :keyword OR user_actions.login LIKE :keyword OR user_actions.phone LIKE :keyword OR user_actions.email LIKE :keyword'
|
||||
@user_actions = @user_actions.joins(:user).where(sql, keyword: "%#{keyword}%")
|
||||
end
|
||||
@user_actions = paginate @user_actions
|
||||
|
|
@ -24,7 +24,7 @@ class Admins::UserActionsController < Admins::BaseController
|
|||
end
|
||||
keyword = params[:keyword].to_s.strip.presence
|
||||
if keyword
|
||||
sql = 'users.login LIKE :keyword OR users.phone LIKE :keyword OR users.mail LIKE :keyword'
|
||||
sql = 'users.login LIKE :keyword OR users.phone LIKE :keyword OR users.mail LIKE :keyword OR user_actions.login LIKE :keyword OR user_actions.phone LIKE :keyword OR user_actions.email LIKE :keyword'
|
||||
@user_actions = @user_actions.joins(:user).where(sql, keyword: "%#{keyword}%")
|
||||
end
|
||||
@user_actions = paginate @user_actions
|
||||
|
|
|
|||
Loading…
Reference in New Issue