Skip to content

P
pisns-forum-api
Commit b4b4f579 authored by 陈家荣's avatar 陈家荣
1 Browse files
Options

update 2

parent 6a5d6237
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 37 deletions
app/controllers/mobile/forumInfo.js
View file @ b4b4f579
...@@ -246,16 +246,15 @@ router.get('/info/:fid/hotThreads', function(req, res, next) { ...@@ -246,16 +246,15 @@ router.get('/info/:fid/hotThreads', function(req, res, next) {
$ne: 3 $ne: 3
}, },
$or: [{ $or: [{
isEvent: 0 isEvent: 0
}, { }, {
isEvent: null isEvent: null
}, { }, {
isEvent: 1, isEvent: 1,
'event.eventStartTime' : {$lte : today}, 'event.eventStartTime' : {$lte : today},
'event.eventEndTime' : {$gte : today} 'event.eventEndTime' : {$gte : today}
}] }]
}; }
};
if (fid) { if (fid) {
...@@ -313,15 +312,14 @@ router.get('/info/:fid/photoThreads', function(req, res, next) { ...@@ -313,15 +312,14 @@ router.get('/info/:fid/photoThreads', function(req, res, next) {
$ne: 3 $ne: 3
}, },
$or: [{ $or: [{
isEvent: 0 isEvent: 0
}, { }, {
isEvent: null isEvent: null
}, { }, {
isEvent: 1, isEvent: 1,
'event.eventStartTime' : {$lte : today}, 'event.eventStartTime' : {$lte : today},
'event.eventEndTime' : {$gte : today} 'event.eventEndTime' : {$gte : today}
}] }]
};
}; };
if (fid) { if (fid) {
...@@ -611,15 +609,14 @@ router.get('/info/:fid/serachThreads', function(req, res, next) { ...@@ -611,15 +609,14 @@ router.get('/info/:fid/serachThreads', function(req, res, next) {
status: 1, status: 1,
info: fid, info: fid,
$or: [{ $or: [{
isEvent: 0 isEvent: 0
}, { }, {
isEvent: null isEvent: null
}, { }, {
isEvent: 1, isEvent: 1,
'event.eventStartTime' : {$lte : today}, 'event.eventStartTime' : {$lte : today},
'event.eventEndTime' : {$gte : today} 'event.eventEndTime' : {$gte : today}
}] }]
};
}; };
if (content) { if (content) {
......
app/controllers/mobile/forumThread.js
View file @ b4b4f579
...@@ -412,15 +412,14 @@ router.get('/thread/searchThread', function(req, res, next) { ...@@ -412,15 +412,14 @@ router.get('/thread/searchThread', function(req, res, next) {
status: status, status: status,
from: from, from: from,
$or: [{ $or: [{
isEvent: 0 isEvent: 0
}, { }, {
isEvent: null isEvent: null
}, { }, {
isEvent: 1, isEvent: 1,
'event.eventStartTime' : {$lte : today}, 'event.eventStartTime' : {$lte : today},
'event.eventEndTime' : {$gte : today} 'event.eventEndTime' : {$gte : today}
}] }]
};
}; };
forumThreadService.findThreadByPage(pageNo, pageSize, q, function(err, result) { forumThreadService.findThreadByPage(pageNo, pageSize, q, function(err, result) {
......
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