From 57dc6723f1cb834e972501c7aded0d531fb2e0d6 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Fri, 2 Aug 2019 17:10:13 +0800
Subject: [PATCH] fix

---
 app/models/course_message.rb     | 2 +-
 config/locales/tidings/zh-CN.yml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/course_message.rb b/app/models/course_message.rb
index acb45d5f4..77c86e3e5 100644
--- a/app/models/course_message.rb
+++ b/app/models/course_message.rb
@@ -28,7 +28,7 @@ class CourseMessage < ApplicationRecord
   def send_deal_tiding
     # 发送申请处理结果消息
     Tiding.create!(
-      user_id: user_id, trigger_user: User.current, container_id: course_id, container_type: 'DealCourse',
+      user_id: course_message_id, trigger_user: User.current, container_id: course_id, container_type: 'DealCourse',
       belong_container: course, extra: content.to_i == 2 ? '7' : '9', tiding_type: 'System', status: status == :PASSED ? 1 : 2
     )
     # 将申请消息置为已处理
diff --git a/config/locales/tidings/zh-CN.yml b/config/locales/tidings/zh-CN.yml
index e00407b28..456f15887 100644
--- a/config/locales/tidings/zh-CN.yml
+++ b/config/locales/tidings/zh-CN.yml
@@ -21,6 +21,9 @@
       "7_2_end": "你提交的加入课堂申请：%s（助教）, 审核未通过"
     StudentJoinCourse_end: "加入了课堂：%s（学生）"
     TeacherJoinCourse:
+      "2_end": "%s将你加入课堂：%s（教师）"
+      "3_end": "%s将你加入课堂：%s（助教）"
+      "4_end": "%s将你加入课堂：%s（学生）"
       "9_end": "%s将你加入课堂：%s（教师）"
       "7_end": "%s将你加入课堂：%s（助教）"
       "10_end": "%s将你加入课堂：%s（学生）"