Commit d7732c18 authored by 陈家荣's avatar 陈家荣

update

parent e93dc73f
...@@ -984,10 +984,15 @@ function getMobileSubThreads(doc, sort, callback) { ...@@ -984,10 +984,15 @@ function getMobileSubThreads(doc, sort, callback) {
if (sort) { if (sort) {
sortBy = sort; sortBy = sort;
} }
ForumThread.find(conditions, subThreadFields).populate('from', 'icon').limit(Number(20)).sort(sortBy).exec(function(err, docs) { async.parallel([function(cb){
ForumThread.distinct('from', conditions, cb);
},function(cb){
countAllByFid(conditions, cb);
},function(cb){
ForumThread.find(conditions, subThreadFields).populate('from', 'icon').sort(sortBy).exec(function(err, docs) {
if (err) { if (err) {
console.error(err); console.error(err);
callback(err, null); cb(err, null);
} else { } else {
var list = []; //用户去重 var list = []; //用户去重
_.forEach(docs, function(one, i) { _.forEach(docs, function(one, i) {
...@@ -1002,14 +1007,20 @@ function getMobileSubThreads(doc, sort, callback) { ...@@ -1002,14 +1007,20 @@ function getMobileSubThreads(doc, sort, callback) {
} }
}); });
var obj = {}; var obj = {};
obj.docTotal = docs.length;
obj.total = list.length;
obj.items = list; obj.items = list;
var newDoc = {};
var newDoc = doc.toObject();
newDoc.subThreads = obj; newDoc.subThreads = obj;
cb(null, newDoc);
callback(null, newDoc); }
});
}],function(err, results){
if (err) {
callback(err);
} else {
var lastResult = results[2];
lastResult.subThreads.docTotal = results[1] || 0;
lastResult.subThreads.total = results[0].length;
callback(null, lastResult);
} }
}); });
} }
......
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