Commit 2b1df705 authored by 刘文胜's avatar 刘文胜

1111

parent 81be1a3b
......@@ -231,8 +231,7 @@ router.put('/infos/moveUP/:id/:order', function(req, res, next) {
var groupId=req.body.groupId || null;
var infoName=req.body.infoName || null;
var conditions={
ent_code:req.session.user.ent_code,
order_idx:{$gte:idx}
ent_code:req.session.user.ent_code
};
if(groupId){
conditions.group=groupId;
......
......@@ -129,7 +129,7 @@ router.post('/notice/search', function(req, res, next) {
top=req.body.top,
status=req.body.status,
finished=req.body.finished;
var _condition = {ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1,createtime:-1};
var _condition = {ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1};
if(title){
_condition.title = new RegExp(title, 'i');
......@@ -212,7 +212,7 @@ router.put('/notice/moveUP/:id/:order', function(req, res, next) {
top=req.body.top,
status=req.body.status,
finished=req.body.finished;
var _condition = {ent_code:req.session.user.ent_code,order_idx:{$gte:idx}},_sort = {top:-1,order_idx:-1,createtime:-1};
var _condition = {ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1};
if(title){
_condition.title = new RegExp(title, 'i');
}
......@@ -265,7 +265,6 @@ router.put('/notice/moveUP/:id/:order', function(req, res, next) {
if(!!plate){
_condition.plate = plate;
}
getAllOrderIDX(_condition,_sort,function(err,results){
if(err){
console.log(err);
......@@ -273,17 +272,16 @@ router.put('/notice/moveUP/:id/:order', function(req, res, next) {
}
var index=-1;
_.forEach(results,function(r,i){
console.log(r._id.toString(),id.toString());
if(r._id.toString() === id.toString()){
index=i;
}
});
if(index === -1){
console.log('没有找到对应项');
return res.json(returnCode.BUSY);
}
var preObj=results[index-1];
if(!preObj){
console.log('已经是第一个了');
return res.json(returnCode.BUSY);
}
var preidx=preObj.order_idx;
......
......@@ -103,8 +103,7 @@ router.put('/tag/moveUP/:id/:order', function(req, res, next) {
var info = req.query.info || '';
var conditions={
ent_code:req.session.user.ent_code,
order_idx:{$gte:idx}
ent_code:req.session.user.ent_code
};
if(tagName){
conditions.title={
......
......@@ -94,7 +94,7 @@ router.get('/notice/newestMsg', function(req, res, next) {
pageSize=req.query.pageSize,
plate=req.query.plate;
var _condition = {status:1,type:2,ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1,createtime:-1};
var _condition = {status:1,type:2,ent_code:req.session.user.ent_code},_sort = {top:-1,order_idx:-1};
if(plate){
_condition.$or=[{plate:plate},{plate:null}];
}else{
......@@ -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,order_idx:-1,createtime:-1};
},_sort = {top:-1,order_idx:-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,order_idx:-1,createtime:-1};
_sort = {top:-1,order_idx:-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