Merge commit '6404a060' into SANDBOX

app/service/forumThreadService.js

@@ -770,42 +770,35 @@ function getSubThreads(doc, sort, callback) {
         pid: doc._id,
         status: 1
     };
-    countAllByFid(conditions, function(err, count) {
+    var sortBy = '-top -quality -created';
+    if (sort) {
+        sortBy = sort;
+    }
+    ForumThread.find(conditions, subThreadFields).populate('from', 'icon').sort(sortBy).exec(function(err, docs) {
         if (err) {
             console.error(err);
             callback(err, null);
         } else {
-            var sortBy = '-top -quality -created';
-            if (sort) {
-                sortBy = sort;
-            }
-            ForumThread.find(conditions, subThreadFields).populate('from', 'icon').sort(sortBy).exec(function(err, docs) {
-                if (err) {
-                    console.error(err);
-                    callback(err, null);
-                } else {
-                    var list = [];   //用户去重
-                    _.forEach(docs, function(one, i) {
-                        var flag = true;
-                        _.forEach(list, function(two, k) {
-                            if(one.from._id == two.from._id){
-                                flag = false;
-                            }
-                        });
-                        if(flag){
-                            list.push(one);
-                        }
-                    });
-                    var obj = {};
-                    obj.total = count;
-                    obj.items = list;
-
-                    var newDoc = doc.toObject();
-                    newDoc.subThreads = obj;
-
-                    callback(null, newDoc);
+            var list = [];   //用户去重
+            _.forEach(docs, function(one, i) {
+                var flag = true;
+                _.forEach(list, function(two, k) {
+                    if(one.from._id == two.from._id){
+                        flag = false;
+                    }
+                });
+                if(flag){
+                    list.push(one);
                 }
             });
+            var obj = {};
+            obj.total = list.length;
+            obj.items = list;
+
+            var newDoc = doc.toObject();
+            newDoc.subThreads = obj;
+
+            callback(null, newDoc);
         }
     });
 }