From 38d57194a9f7c2a5865712cf05642dc4b6e20282 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 10 Jan 2020 13:51:41 +0800
Subject: [PATCH] 1

---
 app/decorators/tiding_decorator.rb | 2 +-
 app/services/discusses_service.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb
index c56fa596e..58345b601 100644
--- a/app/decorators/tiding_decorator.rb
+++ b/app/decorators/tiding_decorator.rb
@@ -206,7 +206,7 @@ module TidingDecorator
         format_str % [parent_container.shixun.name, parent_container.position]
       end
     when 'Memo', 'Message' then
-      message = parent_container.main_subject
+      message = parent_container.parent_id.present? ? message_content_helper(parent_container.content) : parent_container.subject
       I18n.t(locale_format(parent_container_type, parent_container.parent_id.present?)) % message
     when 'HomeworkCommon' then
       I18n.t(locale_format(parent_container_type)) % parent_container.name
diff --git a/app/services/discusses_service.rb b/app/services/discusses_service.rb
index 81ac1eb33..ae6a538ca 100644
--- a/app/services/discusses_service.rb
+++ b/app/services/discusses_service.rb
@@ -58,7 +58,7 @@ class DiscussesService
         praise_count: 0, position: params[:position], challenge_id: params[:challenge_id], hidden: !current_user.admin?
       )
       # 发送手机通知
-      Educoder::Sms.send(mobile:'18173242757', send_type:'discuss', name:'管理员')
+      # Educoder::Sms.send(mobile:'18173242757', send_type:'discuss', name:'管理员')
     rescue Exception => e
       raise(e.message)
     end