Commit 9616d5b7 authored by 陈家荣's avatar 陈家荣

修改消息

parent b86884ff
...@@ -22,6 +22,8 @@ router.post('/message/create', function(req, res, next) { ...@@ -22,6 +22,8 @@ router.post('/message/create', function(req, res, next) {
var ent_code = req.session.user.ent_code; var ent_code = req.session.user.ent_code;
var uid = req.session.user.uid; var uid = req.session.user.uid;
object.ent_code = ent_code; object.ent_code = ent_code;
object.fromUsername = req.session.user.username;
object.fromNickName = req.session.user.nickName;
var to_user_ids = object.to; //接受者ID var to_user_ids = object.to; //接受者ID
if(to_user_ids){ if(to_user_ids){
async.waterfall([ async.waterfall([
...@@ -32,7 +34,7 @@ router.post('/message/create', function(req, res, next) { ...@@ -32,7 +34,7 @@ router.post('/message/create', function(req, res, next) {
}else if(user){ }else if(user){
callback(null,user._id); callback(null,user._id);
}else{ }else{
callback('管理员信息错误',null); callback(null,'');
} }
}); });
}, },
......
...@@ -15,6 +15,14 @@ var ForumMessageSchema = new Schema({ ...@@ -15,6 +15,14 @@ var ForumMessageSchema = new Schema({
index: true, index: true,
ref: 'ForumUser' ref: 'ForumUser'
}, },
fromUsername: { //发消息帐号
type: String,
require: false
},
fromNickName: { //发消息昵称
type: String,
require: false
},
to: [{ //收消息者 to: [{ //收消息者
type: Schema.Types.ObjectId, type: Schema.Types.ObjectId,
require: true, require: true,
......
...@@ -86,7 +86,7 @@ exports.getAll= function(conditions,pageNo,pageSize,callback) { ...@@ -86,7 +86,7 @@ exports.getAll= function(conditions,pageNo,pageSize,callback) {
}else{ }else{
var skip = (pageNo - 1) * pageSize; var skip = (pageNo - 1) * pageSize;
var limit = count - skip > pageSize ? pageSize : (count - skip); var limit = count - skip > pageSize ? pageSize : (count - skip);
ForumMessage.find(conditions).populate('from','_id uid mid nickName').skip(skip).limit(limit).sort({created:-1}).exec(function(err, docs) { ForumMessage.find(conditions).populate('from','uid nickName').skip(skip).limit(limit).sort({created:-1}).exec(function(err, docs) {
if (err) { if (err) {
console.error(err); console.error(err);
callback(err,null); callback(err,null);
......
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