Skip to content

P
pisns-forum-api
Commit 333ffa91 authored by strong's avatar strong
Browse files
Options

Merge branch 'Notice' into SANDBOX

parents a4ad6705 b4e4aa16
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/controllers/mobile/forumNotice.js
View file @ 333ffa91
......@@ -128,7 +128,7 @@ router.get('/notice/newestAct', function(req, res, next) {
ent_code:req.session.user.ent_code,
startdate:{$lte:curdate},
indate:{$gte:curdate},
},_sort = {top:-1,startdate:-1};
},_sort = {top:-1,createtime:-1};
if(plate){
_condition.$or=[{plate:plate},{plate:null}];
}else{
......@@ -157,7 +157,7 @@ router.get('/notice/oldAct', function(req, res, next) {
plate=req.query.plate,
curdate = new Date(),
_condition = {status:1,type:1,ent_code:req.session.user.ent_code,$or:[{indate:{$lt:curdate}},{finished:1}]},
_sort = {top:-1,indate:-1};
_sort = {top:-1,createtime:-1};
if(plate){
_condition.$or=[{plate:plate},{plate:null}];
}else{
......
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