dev_hjm
cxt 6 years ago
parent ca819e490c
commit 536d6ea7f7

@ -577,18 +577,14 @@ class CoursesController < ApplicationController
end
new_teacher.save!
uid_logger_error("###############new_member_id" + new_teacher.id.to_s)
new_member = @course.teachers.where(user_id: applier_user.id).take
# 课堂管理员才有分配权限且课堂分班数大于0
if @user_course_identity < Course::PROFESSOR && @course.course_groups_count > 0 && params[:group_id] && params[:group_id].size > 0
# 分班全选则是不限,不需要做处理
unless @course.course_groups.where(id: params[:group_id]).size == @course.course_groups_count
@course.course_groups.where(id: params[:group_id]).each do |group|
uid_logger_error("###############course_group_id" + group.id.to_s)
unless TeacherCourseGroup.where(course_id: @course.id, user_id: applier_user.id, course_group_id: group.id, course_member_id: new_member.id).exists?
TeacherCourseGroup.create(course_id: @course.id, user_id: applier_user.id, course_member_id: new_member.id, course_group_id: group.id)
unless TeacherCourseGroup.where(course_id: @course.id, user_id: applier_user.id, course_group_id: group.id, course_member_id: new_teacher.id).exists?
TeacherCourseGroup.create(course_id: @course.id, user_id: applier_user.id, course_member_id: new_teacher.id, course_group_id: group.id)
end
end
end
@ -602,7 +598,7 @@ class CoursesController < ApplicationController
normal_status(0, "操作成功")
rescue => e
uid_logger_error(e.message)
tip_exception(e.message)
tip_exception("操作失败")
raise ActiveRecord::Rollback
end
end

@ -28,8 +28,8 @@ class CourseMessage < ApplicationRecord
def send_deal_tiding deal_status
# 发送申请处理结果消息
Tiding.create!(
user_id: course_message_id, trigger_user: 1, container_id: course_id, container_type: 'DealCourse',
belong_container_id: course.id, belong_container_type: "Course", extra: content.to_i == 2 ? '9' : '7', tiding_type: 'System', status: deal_status
user_id: course_message_id, trigger_user_id: 1, container_id: course_id, container_type: 'DealCourse',
belong_container: course, extra: content.to_i == 2 ? '9' : '7', tiding_type: 'System', status: deal_status
)
# 将申请消息置为已处理
Tiding.where(trigger_user_id: user_id, container_id: course_id, container_type: 'JoinCourse', status: 0).update_all(status: 1)

Loading…
Cancel
Save