From 17c145a0f5fd4db151f2fd30af9e4ff6d95bf1f7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 29 Sep 2017 16:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E8=AF=84=E8=AE=BA=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/memos_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index 08ed16723..7e9662563 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -186,7 +186,7 @@ class MemosController < ApplicationController
   end
 
   def reply
-    if params[:parent_id] || params[:memo][:parent_id]
+    if params[:memo].present? && params[:memo][:parent_id].present?
       parent = Memo.find params[:memo][:parent_id]
       @memo = params[:activity_id].blank? ? parent : Memo.find(params[:activity_id].to_i)
       @reply = Memo.new