diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index a3048ac1..c4bfeb3f 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1746,7 +1746,7 @@ end # 删除 def delete_applied_departments - transaction do + ActiveRecord::Base.transaction do applied_department = ApplyAddDepartment.find params[:depart_id] applied_message = AppliedMessage.where(:applied_id => applied_department.id, :applied_type => "ApplyAddDepartment") applied_message.update_all(:status => 3) diff --git a/app/helpers/ec_major_schools_helper.rb b/app/helpers/ec_major_schools_helper.rb index 512e1cef..d4e34219 100644 --- a/app/helpers/ec_major_schools_helper.rb +++ b/app/helpers/ec_major_schools_helper.rb @@ -9,9 +9,9 @@ module EcMajorSchoolsHelper subitem_ids = ec_year.ec_graduation_subitems.reorder(nil).pluck(:id) - relations = EcGraduationRequirementCalculation.joins(ec_course_support: :ec_graduation_subitem_courses).where('ec_graduation_subitem_id in (?)', subitem_ids) + relations = EcGraduationRequirementCalculation.joins(ec_course_support: :ec_graduation_subitem_courses).where('ec_graduation_subitem_courses.ec_graduation_subitem_id in (?)', subitem_ids) - reached_map = relations.where(status: true).group('ec_graduation_subitem_id').count + reached_map = relations.where(status: true).group('ec_graduation_subitem_courses.ec_graduation_subitem_id').count reached_map.keys.size end diff --git a/app/models/competition_team.rb b/app/models/competition_team.rb index e2551710..a8f48b3e 100644 --- a/app/models/competition_team.rb +++ b/app/models/competition_team.rb @@ -11,7 +11,8 @@ class CompetitionTeam < ActiveRecord::Base # attr_accessible :invite_code, :name, :team_type def teacher - User.where(:id => self.teacher_id).first + teacher_id = self.teachers.first&.user_id + User.where(id: teacher_id).first end def group_members diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index e171b517..3e57fce3 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -25,7 +25,7 @@
  • "><%= link_to "教学案例", libraries_path %>
  • -
  • "><%= link_to "众包创新", project_packages_path %>
  • +
  • "><%= link_to "交流问答", forums_path %>
  • <% if User.current.ec_school.present? %>
  • " id="ec_banner"> diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 9875099d..b968b50e 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -27,7 +27,7 @@
  • "><%= link_to "教学案例", libraries_path %>
  • -
  • "><%= link_to "众包创新", project_packages_path %>
  • +
  • "><%= link_to "交流问答", forums_path %>
  • diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 7d938057..e4cfd6cf 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -403,11 +403,11 @@ class NewHeader extends Component {
  • 教学案例
  • -
  • - - {project_packages_url===null||project_packages_url===undefined||project_packages_url===""?'':'众包创新'} - -
  • + {/*
  • */} + {/**/} + {/*{project_packages_url===null||project_packages_url===undefined||project_packages_url===""?'':'众包创新'}*/} + {/**/} + {/*
  • */}
  • 交流问答
  • {ecUrl===null||ecUrl===undefined||ecUrl===""?'':'工程认证'}