Merge branch 'develop' into standalone_develop

This commit is contained in:
2024-03-22 08:49:36 +08:00

View File

@@ -715,7 +715,7 @@ class ApplicationController < ActionController::Base
end end
def find_user_with_id def find_user_with_id
@user = User.find_by_id params[:user_id] @user = User.find_by(type: 'User', id: params[:user_id])
# render_not_found("未找到’#{params[:login]}’相关的用户") unless @user # render_not_found("未找到’#{params[:login]}’相关的用户") unless @user
render_error("未找到相关的用户") unless @user render_error("未找到相关的用户") unless @user
end end