Merge branch 'Notice'

app/controllers/admin/forumNotice.js

@@ -100,16 +100,24 @@ router.post('/notice/search', function(req, res, next) {
         title=req.body.title,
         label=req.body.label,
 		plate=req.body.plate,
+		//createtime=req.body.createtime;
         sort=req.body.sort,
+
         begin_time=req.body.begin_time,
         end_time=req.body.end_time,
         top=req.body.top,
         status=req.body.status,
         finished=req.body.finished;
     var _condition = {ent_code:req.session.user.ent_code},_sort = {};
-
+    //如果sort为空
+    if(!sort)
+    {
+    	_sort = {top:-1,createtime:-1};
+    }
  	if(sort){
- 		_sort[sort] = -1;//降序
+ 		 _sort[sort] = -1;//降序
+ 		// console.log("改了排序");
+ 		//_sort = {top:-1,createtime:-1};
  	}
 
  	if(title){

app/controllers/mobile/forumNotice.js

@@ -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{