Merge commit '60c8e79c' into SANDBOX

app/controllers/admin/forumThread.js

@@ -407,10 +407,7 @@ router.get('/threads/list', function(req, res, next) {
 
     var sortBy = {
         top:-1,
-        // top_order_idx:-1,
         topTime:-1,
-        tag_top:-1,
-        tag_topTime:-1,
         quality:-1,
         created:-1
     };
@@ -428,6 +425,12 @@ router.get('/threads/list', function(req, res, next) {
         conditions.tag = {
             $in: [tagId]
         };
+        sortBy = {
+            top:-1,
+            topTime:-1,
+            quality:-1,
+            created:-1
+        }
     }
     if (pid) {
         conditions.pid = pid;
@@ -455,20 +458,16 @@ router.get('/threads/list', function(req, res, next) {
     if(recommend_threads){//推荐贴
         conditions.new_recommend = 1;
         sortBy = {
-            new_recommend:-1,
             new_recommend_order_idx:-1,
-            new_recommend_time:-1,
-            top:-1,
-            // top_order_idx:-1,
-            topTime:-1,
-            tag_top:-1,
-            tag_topTime:-1,
-            quality:-1,
             created:-1
         };
     }
     if(top_threads){//置顶帖
         conditions.top = 1;
+        sortBy = {
+            top_order_idx:-1,
+            created:-1
+        };
     }
 
     if (eventStatus) {