Commit 48049aa9 authored by strong's avatar strong

Merge commit '57a7dcb5' into SANDBOX

parents 06a14c54 57a7dcb5
...@@ -344,7 +344,7 @@ router.get('/user/getUserFavorUser', function(req, res, next) { ...@@ -344,7 +344,7 @@ router.get('/user/getUserFavorUser', function(req, res, next) {
from: d.to._id, from: d.to._id,
status: 1 status: 1
}; };
forumThreadService.getByConditionsSelectyFieldWithOpentions(conditions, 'title', 1, 0, '-_id', function(err, thread) { forumThreadService.getByConditionsSelectyFieldWithOpentions(conditions, 'title content info', 1, 0, '-_id', function(err, thread) {
if (err) { if (err) {
console.error(err); console.error(err);
cont(err, null); cont(err, null);
...@@ -363,7 +363,8 @@ router.get('/user/getUserFavorUser', function(req, res, next) { ...@@ -363,7 +363,8 @@ router.get('/user/getUserFavorUser', function(req, res, next) {
console.error(err); console.error(err);
res.json( returnCode.BUSY); res.json( returnCode.BUSY);
}else{ }else{
res.json(_.assign(datas, returnCode.SUCCESS)); results.items = datas;
res.json(_.assign(results, returnCode.SUCCESS));
} }
}); });
}); });
......
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