Merge branch 'newfunc_0510_forum_management' into SANDBOX

app/controllers/admin/forumThread.js

@@ -24,7 +24,8 @@ var forumThreadService = require('../../service/forumThreadService'),
     forumLimitOperationService = require('../../service/forumLimitOperationService'),
     forumAboutMEService = require('../../service/forumAboutMEService'),
     httpService = require('../../service/httpService'),
-    redisThreadList = require('../../utils/redisThreadList');
+    redisThreadList = require('../../utils/redisThreadList'),
+    forumFollowThreadService = require('../../service/forumFollowThreadService');
 
 var userUtil = require('../../utils/user');
 var MemoryCache = require('../../utils/simpleCache');
@@ -210,6 +211,16 @@ router.get('/thread/:tid/get', function(req, res, next) {
                 }else{
                     callback(null, datas);
                 }
+            },
+            function(datas, callback) { //获取收藏数
+                forumFollowThreadService.count({thread: tid, ent_code: ent_code}, function(err, result){
+                    if (err) {
+                        callback(err, null);
+                    } else {
+                        datas.push(result)
+                        callback(null, datas);
+                    }
+                });
             }
         ], function(err, results) {
             if (err) {
@@ -226,6 +237,7 @@ router.get('/thread/:tid/get', function(req, res, next) {
                     forumThreadService.getById(results[0].pid, function(err, parentThread) {
                         rs.data = results[0];
                         rs.data.from.exp = results[3] && results[3].allExp ? results[3].allExp : 0;
+                        rs.data.followCount = results[4] ? results[4] : 0;
                         rs.tagList = results[1];
                         rs.parentThread = parentThread;
                         rs.isSameAuthor = isSameAuthor;
@@ -234,6 +246,7 @@ router.get('/thread/:tid/get', function(req, res, next) {
                 } else {
                     rs.data = results[0];
                     rs.data.from.exp = results[3] && results[3].allExp ? results[3].allExp : 0;
+                    rs.data.followCount = results[4] ? results[4] : 0;
                     rs.tagList = results[1];
                     rs.isSameAuthor = isSameAuthor;
                     res.json(_.assign(rs, returnCode.SUCCESS));