Merge commit 'b297a896' into SANDBOX

app/controllers/admin/forumThread.js

@@ -654,15 +654,9 @@ router.get('/thread/:tid/comment/list', function(req, res, next) {
                                     comment.floor = p_comment.floor;
                                     cb(null, comment);
                                 } else if(p_comment && !p_comment.floor){ //上一级没有楼层就再查上一级的评论
-                                    forumCommentService.getCommentParent(new mongoose.Types.ObjectId(p_comment._id), function(err, p_p_comment) {
-                                        if(p_comment){
-                                            var comment = e.toObject();
-                                            comment.floor = p_p_comment.floor;
-                                            cb(null, comment);
-                                        }else{
-                                            cb(null, e);
-                                        }
-                                    });
+                                    var comment = e.toObject();
+                                    comment.floor = comment.oneCommentFloor;
+                                    cb(null, comment);
                                 }else{
                                     cb(null, e);
                                 }
@@ -1020,7 +1014,6 @@ router.post('/thread/comment/add', function(req, res, next) {
                     if (err) {
                         callback(err);
                     } else {
-
                         forumThreadService.getById(tid, function(err, thread) {
                             if (entity.level == 1) {
                                 forumAboutMEService.saveCommentLevel1(thread, comment);

app/models/forumComment.js

@@ -63,6 +63,10 @@ var ForumCommentSchema = new Schema({
 	floor: { //评论楼层
 		type: Number,
 		require: false
+	},
+	oneCommentFloor:{ //一级评论楼层
+		type: Number,
+		require: false
 	}
 }, {
 	'collection': 'pisns_forum_comment'