|
|
|
@ -37,6 +37,8 @@ class SubjectsController < ApplicationController
|
|
|
|
|
else
|
|
|
|
|
# 我的路径
|
|
|
|
|
if reorder == "mine"
|
|
|
|
|
tip_exception(401, "..") unless current_user.logged?
|
|
|
|
|
|
|
|
|
|
mine_subject_id = StageShixun.find_by_sql("select DISTINCT(subject_id) from stage_shixuns where shixun_id in
|
|
|
|
|
(select distinct(shixun_id) from myshixuns where user_id=#{current_user.id})").map(&:subject_id)
|
|
|
|
|
manage_subject_id = SubjectMember.where(user_id: current_user.id).pluck(:subject_id)
|
|
|
|
@ -137,7 +139,7 @@ class SubjectsController < ApplicationController
|
|
|
|
|
if current_user.admin?
|
|
|
|
|
@shixuns = Shixun.select([:id, :name, :status, :myshixuns_count, :identifier]).where(hidden: 0)
|
|
|
|
|
else
|
|
|
|
|
none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id)}").pluck(:shixun_id)
|
|
|
|
|
none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id).to_i}").pluck(:shixun_id)
|
|
|
|
|
|
|
|
|
|
@shixuns = Shixun.select([:id, :name, :status, :myshixuns_count, :identifier]).where.not(id: none_shixun_ids).where(hidden: 0)
|
|
|
|
|
end
|
|
|
|
@ -174,7 +176,7 @@ class SubjectsController < ApplicationController
|
|
|
|
|
WHERE m.course_id = c.id AND m.role in (1,2,3)
|
|
|
|
|
AND m.user_id=#{current_user.id} AND c.is_delete = 0 AND c.is_end = 0").map(&:id)
|
|
|
|
|
@courses = Course.where(id: course_ids)
|
|
|
|
|
@none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id)}").pluck(:shixun_id)
|
|
|
|
|
@none_shixun_ids = ShixunSchool.where("school_id != #{current_user.user_extension.try(:school_id).to_i}").pluck(:shixun_id)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def send_to_course
|
|
|
|
|