Merge commit '23a191fc' into SANDBOX

app/controllers/mobile/forumInfo.js

@@ -495,8 +495,23 @@ router.get('/info/myThreads', function(req, res, next) {
                     console.error(err);
                     res.json(returnCode.BUSY);
                 } else {
+                    //判断是否已经点赞
                     util.loadLevel(req.session.user.ent_code, results.items, function() {
-                        res.json(_.assign(results, returnCode.SUCCESS));
+                        redisPraiseLog.get(req.session.user.ent_code, user.getMobileUser(req), 'thread', function(error, docs) {
+                            _.forEach(results.items, function(d, i) {
+                                if (results.items[i].toObject) {
+                                    results.items[i] = results.items[i].toObject();
+                                }
+                                results.items[i].isPraise = false;
+                                for (var k = docs.length - 1; k >= 0; k--) {
+                                    if (results.items[i]._id == docs[k]) {
+                                        results.items[i].isPraise = true;
+                                        break;
+                                    }
+                                };
+                            });
+                            res.json(_.assign(results, returnCode.SUCCESS));
+                        });
                     });
 
                 }
@@ -854,7 +869,6 @@ router.get('/info/list/allWithThreadCount', function(req, res, next) {
                             if (infos[i].toObject) {
                                 infos[i] = infos[i].toObject();
                             }
-                            console.log(count);
                             infos[i].favor_by = count;
                             cont(null, info);
                         }