Merge branch 'remould_0308_forum'

app/controllers/mobile/forumThread.js

@@ -3,6 +3,7 @@ var express = require('express'),
     router = express.Router(),
     returnCode = require('../../utils/returnCode'),
     util = require('../../utils/util'),
+    loadUserLevel = require('../../utils/loadUserLevel'),
     _ = require('lodash');
 var mongoose = require('mongoose');
 var ForumThread = mongoose.model('ForumThread');
@@ -885,7 +886,16 @@ router.post('/thread/:tid/comment/add', function(req, res, next) {
                                             } else {
                                                 var rs = {};
                                                 rs.data = c;
+                                                loadUserLevel.loadLevelFromAPI(req.session.user.ent_code,rs.data.from.uid,function(err,expValue){
+                                                        if(!err){
+                                                                rs.data=rs.data.toObject();
+                                                                if(!expValue)
+                                                                    rs.data.from.exp=0;
+                                                                else
+                                                                    rs.data.from.exp=expValue[rs.data.from.uid];
+                                                        }
                                                         res.json(_.assign(rs, returnCode.SUCCESS));
+                                                });
                                             }
                                         });
 
@@ -1247,6 +1257,8 @@ router.post('/thread/:tid/comment/:cid/slash', function(req, res, next) {
     q1.status=1;
     q1.$or=[{
         recommend: 0
+    },{
+        recommend: 1
     }, {
         recommend: null
     }];

app/service/forumCommentService.js

@@ -461,7 +461,7 @@ exports.getPopulateCommentById = function(cid, callback) {
         _id: cid
     }).populate({
         path: 'from to',
-        select: 'uid nickName icon'
+        select: 'uid nickName icon honorTitles'
     }).exec(function(err, c) {
         if (err) {
             console.error(err);