merge develop

This commit is contained in:
xiaoxiaoqiong 2021-12-07 16:34:11 +08:00
parent 20bfbdc06f
commit badd950ff9
1 changed files with 1 additions and 1 deletions

View File

@ -12,7 +12,7 @@ class OwnersController < ApplicationController
def show def show
@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_not_found unless @owner.present? return render_ok(type: 'User') unless @owner.present?
# 组织 # 组织
if @owner.is_a?(Organization) if @owner.is_a?(Organization)
return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition