Commit 3f7a2be7 authored by 陈志良's avatar 陈志良

Merge branch 'remould_0727_topic_cache' into SANDBOX

parents f57a25d0 79c5ca80
...@@ -584,23 +584,26 @@ router.get('/thread/:tid/get', function(req, res, next) { ...@@ -584,23 +584,26 @@ router.get('/thread/:tid/get', function(req, res, next) {
thread = threads[0]; thread = threads[0];
} }
if (thread.type == 2 && thread.level == 1&&thread.subThreads.items.length>0) { if (thread.type == 2 && thread.level == 1&&thread.subThreads.items.length>0) {
util.loadLevel(req.session.user.ent_code, thread.subThreads.items, function() { // util.loadLevel(req.session.user.ent_code, thread.subThreads.items, function() {
redisPraiseLog.get(ent_code, user.getMobileUser(req), 'thread', function(error, docs) { // redisPraiseLog.get(ent_code, user.getMobileUser(req), 'thread', function(error, docs) {
if (thread.toObject) { // if (thread.toObject) {
thread = thread.toObject(); // thread = thread.toObject();
} // }
thread.isPraise = false; // thread.isPraise = false;
for (var k = docs.length - 1; k >= 0; k--) { // for (var k = docs.length - 1; k >= 0; k--) {
if (thread._id == docs[k]) { // if (thread._id == docs[k]) {
thread.isPraise = true; // thread.isPraise = true;
break; // break;
} // }
}; // };
// var rs = {};
// rs.data = thread;
// res.json(_.assign(rs, returnCode.SUCCESS));
// });
// });
var rs = {}; var rs = {};
rs.data = thread; rs.data = thread;
res.json(_.assign(rs, returnCode.SUCCESS)); res.json(_.assign(rs, returnCode.SUCCESS));
});
});
} else { } else {
redisPraiseLog.get(ent_code, user.getMobileUser(req), 'thread', function(error, docs) { redisPraiseLog.get(ent_code, user.getMobileUser(req), 'thread', function(error, docs) {
if (thread.toObject) { if (thread.toObject) {
......
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