Merge branch 'remould_1120_spreadchain'

# Conflicts:
#	app/controllers/mobile/forumThread.js

app/controllers/admin/forumThread.js

@@ -960,7 +960,8 @@ var getSubSpreadPaths = function(openIds, c, pvs, cb) {
                 c.children.push({
                     openId: pvs[i].open_id,
                     nickName: pvs[i].user.displayName || '未知',
-                    name: pvs[i].user.nickName || '未知'
+                    name: pvs[i].user.nickName || '未知' , 
+                    id : pvs[i]._id
                 });
                 openIds.push(pvs[i].open_id);
             }
@@ -1017,8 +1018,10 @@ router.get('/thread/:tid/spreadchain', function(req, res, next) {
         var data = {
                 openId: thread.from.uid,
                 name: thread.from.nickName,
-                nickName: thread.from.displayName,
-                children: []
+                //nickName: thread.from.displayName,
+                nickName: thread.from.nickName,
+                children: [] , 
+                id : 'ROOT'
             }
             //获取一级传播
         for (var i = 0; i < pvs.length; i += 1) {
@@ -1036,7 +1039,8 @@ router.get('/thread/:tid/spreadchain', function(req, res, next) {
                     data.children.push({
                         openId: pv.open_id,
                         nickName: pv.user.displayName || '未知',
-                        name: pv.user.nickName || '未知'
+                        name: pv.user.nickName || '未知',
+                        id : pv._id
                     });
                     openIds.push(pv.open_id);
                 }

app/controllers/mobile/forumThread.js

@@ -164,6 +164,7 @@ var raiseOrcancelRaise = function(req, ent_code, tid, userId, callback) {
                     ], function(err, results) {
                         if (err) {
                             console.error(err);
+                            // res.json(returnCode.BUSY);
                             callback(returnCode.BUSY);
                         } else {
                             //更新点赞redis
@@ -176,6 +177,7 @@ var raiseOrcancelRaise = function(req, ent_code, tid, userId, callback) {
                             forumThreadService.getThreadById(tid, function(err, doc) {
                                 if (err) {
                                     console.error(err);
+                                    // res.json(returnCode.BUSY);
                                     callback(returnCode.BUSY);
                                 } else {
                                     var rs = {};
@@ -1150,7 +1152,6 @@ router.post('/thread/:tid/praiseOrCancelPraise', function(req, res, next) {
     }
 });
 
-
 //文章分享
 router.post('/thread/:tid/share', function(req, res, next) {
     var tid = req.params.tid || null;