Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

app/services/shixuns_service.rb

@@ -119,6 +119,9 @@ class ShixunsService
     @children_list = []
     # 目前只取十个，不多N+1问题不大
     # 需要彻底解决则需要改数据路结构，比如Nested算法可以解决
+    unless current_user.admin?
+      discusses = discusses.where(:hidden => false)
+    end
     if discusses.present?
       discusses.each do |d|
         # 总点赞数

db/migrate/20190605063236_modify_hidden_defualt_for_discusses.rb

@@ -0,0 +1,8 @@
+class ModifyHiddenDefualtForDiscusses < ActiveRecord::Migration
+  def up
+    change_column :discusses, :hidden, :boolean, :default => true
+  end
+
+  def down
+  end
+end

public/react/src/modules/comment/Comments.js

@@ -213,11 +213,12 @@ class Comments extends Component {
 
 				<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
 					<div className="color-grey-3 break_word_comments" id={`reply_content_${item.id}`}>
-					
-						{ item.hidden && comment.admin === false && comment.manager === false 
+						{/* 改成后端返回了的，都是要显示的，不管hidden的值是true还是false */}
+						{/* { item.hidden && comment.admin === false && comment.manager === false 
 								? <p className="color-orange font-16">违规评论已被屏蔽！</p>
-								: <div dangerouslySetInnerHTML={{__html: _content}}></div> 
-							}
+								:  */}
+								<div dangerouslySetInnerHTML={{__html: _content}}></div> 
+							{/* } */}
 
 						<div className="cl"></div>
 					</div>
@@ -309,10 +310,12 @@ class Comments extends Component {
 
 								<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
 									<div className="color-grey-3 break_word_comments" id={`reply_content_${item.id}`}>
-										{ item.hidden && item.admin === false && (item.manager === false || item.manager == undefined)
+										{/* 改成后端返回了的，都是要显示的，不管hidden的值是true还是false */}
+										{/* { item.hidden && item.admin === false && (item.manager === false || item.manager == undefined)
 											? <p className="color-orange font-16">违规评论已被屏蔽！</p>
-											: <div dangerouslySetInnerHTML={{__html: _content}}></div> 
-										}
+											:  */}
+											<div dangerouslySetInnerHTML={{__html: _content}}></div> 
+										{/* } */}
 										<div className="cl"></div>
 									</div>
 								</div>