diff --git a/app/controllers/partners_controller.rb b/app/controllers/partners_controller.rb index b2f8abc4c..7875e1780 100644 --- a/app/controllers/partners_controller.rb +++ b/app/controllers/partners_controller.rb @@ -26,6 +26,7 @@ class PartnersController < ApplicationController if params[:manager_group_id].present? # 重命名 @manager_group = current_partner.partner_manager_groups.find(params[:manager_group_id]) + return render_error('不能修改管理者权限组名称') if @manager_group.admin? @manager_group.update!(name: name) else # 新建 @@ -35,6 +36,7 @@ class PartnersController < ApplicationController def remove_manager_group manager_group = current_partner.partner_manager_groups.find(params[:manager_group_id]) + return render_error('不能删除管理者权限组') if manager_group.admin? manager_group.destroy! render_delete_success @@ -57,6 +59,8 @@ class PartnersController < ApplicationController def remove_partner_manager partner_manager = current_partner.partner_managers.find(params[:manager_id]) + return render_error('不能删除自己') if partner_manager.user_id == current_user.id && partner_manager.partner_manager_group.admin? + partner_manager.destroy! render_delete_success diff --git a/app/controllers/users/authentication_applies_controller.rb b/app/controllers/users/authentication_applies_controller.rb index 183df2f65..3c43be553 100644 --- a/app/controllers/users/authentication_applies_controller.rb +++ b/app/controllers/users/authentication_applies_controller.rb @@ -17,6 +17,6 @@ class Users::AuthenticationAppliesController < Users::BaseAccountController private def create_params - params.permit(:name, :gender, :id_number, :upload_image, attachment_ids: []) + params.permit(:name, :show_realname, :gender, :id_number, :upload_image, attachment_ids: []) end end \ No newline at end of file diff --git a/app/forms/users/apply_authentication_form.rb b/app/forms/users/apply_authentication_form.rb index a9cb60eec..e0e7931b1 100644 --- a/app/forms/users/apply_authentication_form.rb +++ b/app/forms/users/apply_authentication_form.rb @@ -1,7 +1,7 @@ class Users::ApplyAuthenticationForm include ActiveModel::Model - attr_accessor :name, :id_number, :gender, :upload_image, :attachment_ids + attr_accessor :name, :show_realname, :id_number, :gender, :upload_image, :attachment_ids validates :name, presence: true validate :validate_ID_number diff --git a/app/services/users/apply_authentication_service.rb b/app/services/users/apply_authentication_service.rb index cab76b45c..1b9b02c91 100644 --- a/app/services/users/apply_authentication_service.rb +++ b/app/services/users/apply_authentication_service.rb @@ -15,6 +15,7 @@ class Users::ApplyAuthenticationService < ApplicationService user.lastname = params[:name].to_s.strip user.firstname = '' user.ID_number = params[:id_number].to_s.strip.presence + user.show_realname = params[:show_realname].to_s == 'true' if params[:show_realname].to_s.present? ActiveRecord::Base.transaction do user.authentication = false diff --git a/app/views/partners/shared/_partner_managers.html.erb b/app/views/partners/shared/_partner_managers.html.erb index 3896d70ed..7ad98d0b9 100644 --- a/app/views/partners/shared/_partner_managers.html.erb +++ b/app/views/partners/shared/_partner_managers.html.erb @@ -4,11 +4,13 @@ <% manager_group.partner_managers.each do |manager| %>