Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development

app/controllers/mobile/forumInfo.js

@@ -133,6 +133,7 @@ router.get('/info/:fid/threads', function(req, res, next) {
     var pageNo = req.query.pageNo || 1;
     var pageSize = req.query.pageSize || 10;
     var fid = req.params.fid;
+    var sort = 'top -topTime -created'
     var conditions = {
         ent_code: req.session.user.ent_code,
         level: 1
@@ -165,7 +166,7 @@ router.get('/info/:fid/threads', function(req, res, next) {
                         $nin: result.thread
                     };
                 }
-                forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, null, function(err, results) {
+                forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, sort, function(err, results) {
                     if (err) {
                         console.error(err);
                         res.json(returnCode.BUSY);

app/controllers/mobile/forumTag.js

@@ -58,7 +58,7 @@ router.get('/tag/:tid/threads', function(req, res, next) {
 	var pageNo = req.query.pageNo || 1;
     var pageSize = req.query.pageSize || 10;
     var tid=req.params.tid;
-    var sort = req.query.sort || '';
+    var sort = 'tag_top -tag_topTime -created';
     var conditions={
     	ent_code:req.session.user.ent_code
     };