Merge commit 'ea64a2be' into SANDBOX

app/service/forumThreadService.js

@@ -9,6 +9,7 @@ var forumCommentService = require('./forumCommentService');
 
 var async = require('async');
 var then = require('thenjs');
+var _ = require('lodash');
 
 var redisThreadList = require('../utils/redisThreadList');
 
@@ -783,9 +784,21 @@ function getSubThreads(doc, sort, callback) {
                     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 = docs;
+                    obj.items = list;
 
                     var newDoc = doc.toObject();
                     newDoc.subThreads = obj;