From ad2c5212a3952571cfb71d0c19e348d2697eff52 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 27 Dec 2019 15:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/discuss.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/discuss.rb b/app/models/discuss.rb
index 4491a886c..54ceb46be 100644
--- a/app/models/discuss.rb
+++ b/app/models/discuss.rb
@@ -53,11 +53,11 @@ class Discuss < ApplicationRecord
 
   def send_tiding
     if dis_type == 'Shixun'
-      user_id = has_parent? ? parent.user_id : Challenge.find(challenge_id).user_id
+      send_user_id = has_parent? ? parent.user_id : Challenge.find(challenge_id).user_id
       parent_container_type = 'Challenge'
       challenge_id = challenge_id
     elsif dis_type == 'Hack'
-      user_id = has_parent? ? parent.user_id : Hack.find(dis_id).user_id
+      send_user_id = has_parent? ? parent.user_id : Hack.find(dis_id).user_id
       parent_container_type = 'Hack'
       challenge_id = dis_id
     end
@@ -65,6 +65,6 @@ class Discuss < ApplicationRecord
         trigger_user_id: user_id, parent_container_id: challenge_id, parent_container_type: parent_container_type,
         belong_container_id: dis_id, belong_container_type: dis_type, viewed: 0, tiding_type: 'Comment'
     }
-    tidings.create!(base_attrs.merge(user_id: user_id))
+    tidings.create!(base_attrs.merge(user_id: send_user_id))
   end
 end