Skip to content

P
pisns-forum-api
Commit 55d36ef2 authored by 刘文胜's avatar 刘文胜
Browse files
Options

1111

parent 2b1df705
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
app/controllers/admin/forumNotice.js
View file @ 55d36ef2
...@@ -129,7 +129,7 @@ router.post('/notice/search', function(req, res, next) { ...@@ -129,7 +129,7 @@ router.post('/notice/search', function(req, res, next) {
top=req.body.top, top=req.body.top,
status=req.body.status, status=req.body.status,
finished=req.body.finished; finished=req.body.finished;
var _condition = {ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1}; var _condition = {ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1,createtime:-1};
if(title){ if(title){
_condition.title = new RegExp(title, 'i'); _condition.title = new RegExp(title, 'i');
...@@ -212,7 +212,7 @@ router.put('/notice/moveUP/:id/:order', function(req, res, next) { ...@@ -212,7 +212,7 @@ router.put('/notice/moveUP/:id/:order', function(req, res, next) {
top=req.body.top, top=req.body.top,
status=req.body.status, status=req.body.status,
finished=req.body.finished; finished=req.body.finished;
var _condition = {ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1}; var _condition = {ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1,createtime:-1};
if(title){ if(title){
_condition.title = new RegExp(title, 'i'); _condition.title = new RegExp(title, 'i');
} }
...@@ -272,7 +272,6 @@ router.put('/notice/moveUP/:id/:order', function(req, res, next) { ...@@ -272,7 +272,6 @@ router.put('/notice/moveUP/:id/:order', function(req, res, next) {
} }
var index=-1; var index=-1;
_.forEach(results,function(r,i){ _.forEach(results,function(r,i){
console.log(r._id.toString(),id.toString());
if(r._id.toString() === id.toString()){ if(r._id.toString() === id.toString()){
index=i; index=i;
} }
......
app/controllers/mobile/forumNotice.js
View file @ 55d36ef2
...@@ -94,7 +94,7 @@ router.get('/notice/newestMsg', function(req, res, next) { ...@@ -94,7 +94,7 @@ router.get('/notice/newestMsg', function(req, res, next) {
pageSize=req.query.pageSize, pageSize=req.query.pageSize,
plate=req.query.plate; plate=req.query.plate;
var _condition = {status:1,type:2,ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1}; var _condition = {status:1,type:2,ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1,createtime:-1};
if(plate){ if(plate){
_condition.$or=[{plate:plate},{plate:null}]; _condition.$or=[{plate:plate},{plate:null}];
}else{ }else{
...@@ -128,7 +128,7 @@ router.get('/notice/newestAct', function(req, res, next) { ...@@ -128,7 +128,7 @@ router.get('/notice/newestAct', function(req, res, next) {
ent_code:req.session.user.ent_code, ent_code:req.session.user.ent_code,
startdate:{$lte:curdate}, startdate:{$lte:curdate},
indate:{$gte:curdate}, indate:{$gte:curdate},
},_sort = {top:-1,order_idx:-1}; },_sort = {top:-1,order_idx:-1,createtime:-1};
if(plate){ if(plate){
_condition.$or=[{plate:plate},{plate:null}]; _condition.$or=[{plate:plate},{plate:null}];
}else{ }else{
...@@ -157,7 +157,7 @@ router.get('/notice/oldAct', function(req, res, next) { ...@@ -157,7 +157,7 @@ router.get('/notice/oldAct', function(req, res, next) {
plate=req.query.plate, plate=req.query.plate,
curdate = new Date(), curdate = new Date(),
_condition = {status:1,type:1,ent_code:req.session.user.ent_code,$or:[{indate:{$lt:curdate}},{finished:1}]}, _condition = {status:1,type:1,ent_code:req.session.user.ent_code,$or:[{indate:{$lt:curdate}},{finished:1}]},
_sort = {top:-1,order_idx:-1}; _sort = {top:-1,order_idx:-1,createtime:-1};
if(plate){ if(plate){
_condition.$or=[{plate:plate},{plate:null}]; _condition.$or=[{plate:plate},{plate:null}];
}else{ }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