Merge branch 'develop' into standalone_develop
This commit is contained in:
commit
6dc2f0b062
|
@ -11,6 +11,8 @@ class OwnersController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
return render_not_found unless @user.present?
|
||||||
|
|
||||||
@owner = Owner.find_by(login: params[:id]) || Owner.find_by(id: params[:id])
|
@owner = Owner.find_by(login: params[:id]) || Owner.find_by(id: params[:id])
|
||||||
return render_ok(type: 'User') unless @owner.present?
|
return render_ok(type: 'User') unless @owner.present?
|
||||||
# 组织
|
# 组织
|
||||||
|
|
Loading…
Reference in New Issue