Merge branch 'Gabriel_0831' into SANDBOX

app/controllers/mobile/forumInfo.js

@@ -403,7 +403,7 @@ router.get('/info/myThreads', function(req, res, next) {
                     };
                 }
                 //获取子话题数据
-                forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-praise_count', function(err, results) {
+                forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-created', function(err, results) {
                     if (err) {
                         console.error(err);
                         res.json(returnCode.BUSY);

app/controllers/mobile/forumThread.js

@@ -560,7 +560,7 @@ router.post('/thread/:tid/comment/add', function(req, res, next) {
                                                                     callback(err, null);
                                                                 } else {
 																	if(user.getMobileUser(req) !== thread.from){//文章的作者不等于评论的作者才增加消息数
-																		commentTips.incrTips(req.session.user.ent_code,thread.from);
+																		commentTips.incrTips(req.session.user.ent_code,thread.from._id);
                                                                         forumThreadAttendService.threadAttend(thread._id,user.getMobileUser(req),function(err){});
 																	}
                                                                     var comments = thread.comments;
@@ -708,7 +708,7 @@ router.post('/thread/:tid/comment/create', function(req, res, next) {
                                                                     callback(err, null);
                                                                 } else {
 																	if(user.getMobileUser(req) !== thread.from){//文章的作者不等于评论的作者才增加消息数
-																		commentTips.incrTips(req.session.user.ent_code,thread.from);
+																		commentTips.incrTips(req.session.user.ent_code,thread.from._id);
                                                                         forumThreadAttendService.threadAttend(thread._id,user.getMobileUser(req),function(err){});
 																	}
                                                                     var comments = thread.comments;