From 781aa130eabb52e6f5ece73a696a8f84a5c5c589 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 15 Nov 2019 20:34:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/gits_controller.rb | 1 + app/models/user.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/gits_controller.rb b/app/controllers/gits_controller.rb index 973f1e9dc..800b14daf 100644 --- a/app/controllers/gits_controller.rb +++ b/app/controllers/gits_controller.rb @@ -54,6 +54,7 @@ class GitsController < ApplicationController uid_logger("git start auth: systemuser is #{system_user.try(:login)}") if shixun.present? + logger.info("#######{system_user.manager_of_shixun?(shixun)}") if system_user.present? && system_user.manager_of_shixun?(shixun) result = true else diff --git a/app/models/user.rb b/app/models/user.rb index aa02ecb4c..f617b94b9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -331,6 +331,7 @@ class User < ApplicationRecord # 实训管理员:实训合作者、admin def manager_of_shixun?(shixun) + logger.info("############id: #{id}") shixun.shixun_members.exists?(role: [1,2], user_id: id) || admin? || business? end