Commit 0ddba2d1 authored by 陈家荣's avatar 陈家荣

Merge branch 'newfunc_0620_comment_list' into SANDBOX

parents d54ba27a b4e44995
...@@ -209,9 +209,8 @@ exports.getAllCommentWithThreeeChildrenComment = function(conditions, pageNo, pa ...@@ -209,9 +209,8 @@ exports.getAllCommentWithThreeeChildrenComment = function(conditions, pageNo, pa
.populate({ .populate({
path: 'comments', path: 'comments',
options: { options: {
where:{status:1},
limit: 3, limit: 3,
sort: '-created', sort: '_id',
populate:'from to' populate:'from to'
} }
}).limit(limit).skip(skip).sort('-created').exec(function(err, docs) { }).limit(limit).skip(skip).sort('-created').exec(function(err, docs) {
...@@ -820,9 +819,8 @@ exports.getAllComment_allstatus_v2 = function(conditions, pageNo, pageSize, call ...@@ -820,9 +819,8 @@ exports.getAllComment_allstatus_v2 = function(conditions, pageNo, pageSize, call
ForumComment.find(conditions,listCommentFields).populate('from','uid mid nickName icon exp honorTitles').populate({ ForumComment.find(conditions,listCommentFields).populate('from','uid mid nickName icon exp honorTitles').populate({
path: 'comments', path: 'comments',
options: { options: {
where:{status:1},
limit: 3, limit: 3,
sort: '-_id', sort: '_id',
populate:'from to' populate:'from to'
} }
}).populate('to','uid mid nickName icon exp').limit(limit).skip(skip).sort('-created').exec(function(err, docs) { }).populate('to','uid mid nickName icon exp').limit(limit).skip(skip).sort('-created').exec(function(err, docs) {
...@@ -897,10 +895,9 @@ exports.getCommentByIdWhitChirdentComment = function(conditions, pageNo, pageSiz ...@@ -897,10 +895,9 @@ exports.getCommentByIdWhitChirdentComment = function(conditions, pageNo, pageSiz
}).populate('to','uid mid nickName icon exp').populate({ }).populate('to','uid mid nickName icon exp').populate({
path: 'comments', path: 'comments',
options: { options: {
where:{status:1},
skip: skip, skip: skip,
limit: limit, limit: limit,
sort: '-created', sort: '_id',
populate:'from to' populate:'from to'
} }
}).exec(function(err, doc) { }).exec(function(err, doc) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment