修改查询消息列表接口

app/controllers/admin/forumMessage.js

@@ -199,14 +199,42 @@ router.get('/message/searchList', function(req, res, next) {
 	var pageNo = req.query.pageNo || 1,
     	pageSize = req.query.pageSize || 10,
     	ent_code = req.session.user.ent_code,
-    	status = req.query.status || null;
+    	title = req.query.title || null,
+    	content = req.query.content || null,
+    	begin_time = req.query.begin_time || null,
+    	end_time = req.query.end_time || null;
 
     //查询用户条件
     var q = {
         ent_code: ent_code
     }
-    if(status){
-    	q.status = Number(status);
+    if(title){
+		q.title = {
+            $regex: title,
+        	$options: 'i'
+        };
+	}
+
+	if(content){
+		q.content = {
+            $regex: content,
+        	$options: 'i'
+        };
+	}
+
+	if(begin_time && end_time){
+		q.created = {
+            $gte: begin_time,
+            $lte: end_time
+        }
+    }else if(begin_time && !end_time){
+    	q.created = {
+            $gte: begin_time
+        }
+    }else if(!begin_time && end_time){
+    	q.created = {
+            $lte: end_time
+        }
     }
 
     forumMessageService.getAll(q, pageNo, pageSize, function(err, result) {

app/service/forumMessageService.js

@@ -86,7 +86,7 @@ exports.getAll= function(conditions,pageNo,pageSize,callback) {
 		}else{
 			var skip = (pageNo - 1) * pageSize;
 		    var limit = count - skip > pageSize ? pageSize : (count - skip);
-			ForumMessage.find(conditions).skip(skip).limit(limit).sort({created:-1}).exec(function(err, docs) {
+			ForumMessage.find(conditions).populate('from','_id uid mid nickName').skip(skip).limit(limit).sort({created:-1}).exec(function(err, docs) {
 				if (err) {
 					console.error(err);
 					callback(err,null);