Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

2024-10-08 11:17:29 +08:00 · 2024-10-08 11:17:29 +08:00 · 94667f4b71
parent 05e3036a2f ea76beb1bf
commit 94667f4b71
1 changed files with 2 additions and 1 deletions
--- a/app/controllers/owners_controller.rb
+++ b/app/controllers/owners_controller.rb
@ -11,7 +11,8 @@ class OwnersController < ApplicationController
  end

  def show 
-    @owner = Owner.find_by(login: params[:id]) || Owner.find_by(id: params[:id])
+    login = params[:id].to_s[0..-6]
+    @owner = Owner.find_by(login: login) || Owner.find_by(id: login)
    clear_user_cookie unless @owner.present?
    return render_not_found unless @owner.present?
    # 组织