Skip to content

P
pisns-forum-api
Commit 41eff4d8 authored by strong's avatar strong
Browse files
Options

Merge commit '60c8e79c' into SANDBOX

parents 342ab175 60c8e79c
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 11 deletions
app/controllers/admin/forumThread.js
View file @ 41eff4d8
...@@ -407,10 +407,7 @@ router.get('/threads/list', function(req, res, next) { ...@@ -407,10 +407,7 @@ router.get('/threads/list', function(req, res, next) {
var sortBy = { var sortBy = {
top:-1, top:-1,
// top_order_idx:-1,
topTime:-1, topTime:-1,
tag_top:-1,
tag_topTime:-1,
quality:-1, quality:-1,
created:-1 created:-1
}; };
...@@ -428,6 +425,12 @@ router.get('/threads/list', function(req, res, next) { ...@@ -428,6 +425,12 @@ router.get('/threads/list', function(req, res, next) {
conditions.tag = { conditions.tag = {
$in: [tagId] $in: [tagId]
}; };
sortBy = {
top:-1,
topTime:-1,
quality:-1,
created:-1
}
} }
if (pid) { if (pid) {
conditions.pid = pid; conditions.pid = pid;
...@@ -455,20 +458,16 @@ router.get('/threads/list', function(req, res, next) { ...@@ -455,20 +458,16 @@ router.get('/threads/list', function(req, res, next) {
if(recommend_threads){//推荐贴 if(recommend_threads){//推荐贴
conditions.new_recommend = 1; conditions.new_recommend = 1;
sortBy = { sortBy = {
new_recommend:-1,
new_recommend_order_idx:-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 created:-1
}; };
} }
if(top_threads){//置顶帖 if(top_threads){//置顶帖
conditions.top = 1; conditions.top = 1;
sortBy = {
top_order_idx:-1,
created:-1
};
} }
if (eventStatus) { if (eventStatus) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment