修改用户的schools表关联

This commit is contained in:
sylor_huang@126.com 2020-04-21 10:24:27 +08:00
parent f95b4ad982
commit 5410e11a51
2 changed files with 12 additions and 12 deletions

View File

@ -106,8 +106,8 @@ class User < ApplicationRecord
#问卷 #问卷
has_many :course_members, :dependent => :destroy has_many :course_members, :dependent => :destroy
has_many :poll_votes, :dependent => :destroy # has_many :poll_votes, :dependent => :destroy
has_many :poll_users, :dependent => :destroy # has_many :poll_users, :dependent => :destroy
has_many :messages,foreign_key: 'author_id',:dependent => :destroy has_many :messages,foreign_key: 'author_id',:dependent => :destroy
@ -117,13 +117,13 @@ class User < ApplicationRecord
has_many :attachments,foreign_key: :author_id, :dependent => :destroy has_many :attachments,foreign_key: :author_id, :dependent => :destroy
# 工程认证 # 工程认证
has_many :ec_school_users,:dependent => :destroy # has_many :ec_school_users,:dependent => :destroy
has_many :schools, :through => :ec_school_users # has_many :schools, :through => :ec_school_users
has_many :ec_major_school_users, :dependent => :destroy # has_many :ec_major_school_users, :dependent => :destroy
has_many :ec_major_schools, :through => :ec_major_school_users # has_many :ec_major_schools, :through => :ec_major_school_users
#
has_many :ec_course_users # has_many :ec_course_users
has_many :department_members, dependent: :destroy #部门管理员 has_many :department_members, dependent: :destroy #部门管理员
@ -305,9 +305,9 @@ class User < ApplicationRecord
end end
# 用户的学校名称 # 用户的学校名称
def school_name # def school_name
user_extension&.school&.name || '' # user_extension&.school&.name || ''
end # end
# 用户的学院名称 # 用户的学院名称
def department_name def department_name

View File

@ -14,7 +14,7 @@ json.projects do
json.id user.id json.id user.id
json.real_name user.real_name json.real_name user.real_name
json.avatar_url url_to_avatar(user) json.avatar_url url_to_avatar(user)
json.school_name user.school_name # json.school_name user.school_name
end end
json.category do json.category do
if project.project_category.blank? if project.project_category.blank?