Commit a6ee8be4 authored by 陈家荣's avatar 陈家荣

更新系统消息查询创建接口

parent 1806e502
...@@ -20,7 +20,7 @@ module.exports = function(app) { ...@@ -20,7 +20,7 @@ module.exports = function(app) {
router.post('/message/create', function(req, res, next) { router.post('/message/create', function(req, res, next) {
var object = req.body; var object = req.body;
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.id;
object.ent_code = ent_code; object.ent_code = ent_code;
object.fromUsername = req.session.user.username; object.fromUsername = req.session.user.username;
object.fromNickName = req.session.user.nickName; object.fromNickName = req.session.user.nickName;
......
...@@ -1907,7 +1907,7 @@ router.get('/thread/getThreadWithEssence', function(req, res, next) { ...@@ -1907,7 +1907,7 @@ router.get('/thread/getThreadWithEssence', function(req, res, next) {
//更新推荐列表redis //更新推荐列表redis
redisThreadList.get(ent_code, "", redis_type, function(error, docs) { redisThreadList.get(ent_code, "", redis_type, function(error, docs) {
var results = JSON.parse(docs); var results = JSON.parse(docs);
if(results.items == null){ //如果不存在,继续重新获取 if(results.items == null || results.items.length <= 0){ //如果不存在,继续重新获取
redisThreadList.getRedisEsenceThreads(ent_code, "", redis_type, function(error, docs){ redisThreadList.getRedisEsenceThreads(ent_code, "", redis_type, function(error, docs){
if(error){ if(error){
console.error(err); console.error(err);
......
...@@ -185,11 +185,13 @@ exports.getMessages= function(conditions, status, pageNo, pageSize, callback) { ...@@ -185,11 +185,13 @@ exports.getMessages= function(conditions, status, pageNo, pageSize, callback) {
callback(err,null,null); callback(err,null,null);
} else { } else {
var messages = []; var messages = [];
for (var i = docs.messages.length - 1; i >= 0; i--) { if(docs.messages){
if(docs.messages[i].status != status){ for (var i = docs.messages.length - 1; i >= 0; i--) {
messages.push(docs.messages[i]); if(docs.messages[i].status != status){
messages.push(docs.messages[i]);
}
} }
}; }
var total = messages.length; var total = messages.length;
var skip = (pageNo - 1) * pageSize; var skip = (pageNo - 1) * pageSize;
var limit = total - skip > pageSize ? pageSize : (total - skip); var limit = total - skip > pageSize ? pageSize : (total - skip);
......
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