Merge commit '045d3c41' into SANDBOX

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

app/controllers/admin/forumThread.js

@@ -326,7 +326,8 @@ router.post('/thread/:tid/:fid/recommend', function(req, res, next) {
     var tid = req.params.tid,
         fid = req.params.fid,
         ent_code = req.session.user.ent_code,
-        mid = req.body.mid; //板块ID
+        thread_from_id = req.body.thread_from_id; 
+        mid = req.body.mid; 
     if (tid && fid) {
         forumThreadService.updateRecommendByThreadId(tid, function(err, thread) {
             if (err) {
@@ -334,19 +335,24 @@ router.post('/thread/:tid/:fid/recommend', function(req, res, next) {
                 res.json(returnCode.BUSY);
             } else {
                 if (mid) {
-                    forumLimitOperationService.checkLimitOperationProhibitionAddIntegral(tid, function(err, flag) {
-                        if (err) {
-                            console.error(err);
-                            res.json(returnCode.PROHIBITION_OF_SPEECH);
-                        } else {
-                            if (flag) {
+                    if(thread_from_id){
+                        forumLimitOperationService.checkLimitOperationProhibitionAddIntegral(thread_from_id, function(err, flag) {
+                            if (err) {
+                                console.error(err);
                                 res.json(returnCode.PROHIBITION_OF_SPEECH);
                             } else {
-                                httpService.sendRequest(ent_code, mid, 'thread_recomment');
-                                res.json(returnCode.SUCCESS);
+                                if (flag) {
+                                    res.json(returnCode.PROHIBITION_OF_SPEECH);
+                                } else {
+                                    httpService.sendRequest(ent_code, mid, 'thread_recomment');
+                                    res.json(returnCode.SUCCESS);
+                                }
                             }
-                        }
-                    });
+                        });
+                    }else{
+                        httpService.sendRequest(ent_code, mid, 'thread_recomment');
+                        res.json(returnCode.SUCCESS);
+                    }
                 } else {
                     res.json(returnCode.SUCCESS);
                 }

app/controllers/mobile/forumThread.js

@@ -672,7 +672,6 @@ router.post('/thread/:tid/delete', function(req, res, next) {
     }
 });
 
-
 //文章点赞
 router.post('/thread/:tid/raise', function(req, res, next) {
     var userId = req.session.mobileForumUser.userId;