From 5410e11a51ddddb7d4c0272f13d633bc038837e9 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Tue, 21 Apr 2020 10:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E7=9A=84sc?=
 =?UTF-8?q?hools=E8=A1=A8=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                     | 22 +++++++++++-----------
 app/views/users/projects.json.jbuilder |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index e9c310b9e..55b3f038d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -106,8 +106,8 @@ class User < ApplicationRecord
 
   #问卷
   has_many :course_members, :dependent => :destroy
-  has_many :poll_votes, :dependent => :destroy
-  has_many :poll_users, :dependent => :destroy
+  # has_many :poll_votes, :dependent => :destroy
+  # has_many :poll_users, :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 :ec_school_users,:dependent => :destroy
-  has_many :schools, :through => :ec_school_users
+  # has_many :ec_school_users,:dependent => :destroy
+  # has_many :schools, :through => :ec_school_users
 
-  has_many :ec_major_school_users, :dependent => :destroy
-  has_many :ec_major_schools, :through => :ec_major_school_users
-
-  has_many :ec_course_users
+  # has_many :ec_major_school_users, :dependent => :destroy
+  # has_many :ec_major_schools, :through => :ec_major_school_users
+  #
+  # has_many :ec_course_users
 
   has_many :department_members, dependent: :destroy #部门管理员
 
@@ -305,9 +305,9 @@ class User < ApplicationRecord
   end
 
   # 用户的学校名称
-  def school_name
-    user_extension&.school&.name || ''
-  end
+  # def school_name
+  #   user_extension&.school&.name || ''
+  # end
 
   # 用户的学院名称
   def department_name
diff --git a/app/views/users/projects.json.jbuilder b/app/views/users/projects.json.jbuilder
index cd2da7eb7..bac797aee 100644
--- a/app/views/users/projects.json.jbuilder
+++ b/app/views/users/projects.json.jbuilder
@@ -14,7 +14,7 @@ json.projects do
       json.id user.id
       json.real_name user.real_name
       json.avatar_url url_to_avatar(user)
-      json.school_name user.school_name
+      # json.school_name user.school_name
     end
     json.category do
       if project.project_category.blank?