Merge remote-tracking branch 'remotes/origin/remould_0614_thumbup' into SANDBOX

app/controllers/mobile/forumAboutMe.js

@@ -6,7 +6,7 @@ var express = require('express'),
     returnCode = require('../../utils/returnCode'),
     _ = require('lodash');
 var forumAboutMEService = require('../../service/forumAboutMEService');
-var redisPraiseLog = require('../../utils/redisPraiseLog');
+
 
 module.exports = function(app) {
     app.use('/v1/forum', router);
@@ -17,42 +17,16 @@ router.get('/aboutme/me2other', function(req, res, next) {
     var entcode = req.session.user.ent_code;
     var pageNo = req.query.pageNo || 1;
     var pageSize = req.query.pageSize || 10;
+    console.log(userId);
+    console.log(entcode);
     forumAboutMEService.me2other(entcode, userId, pageNo, pageSize, function(err, result) {
         if (err) {
             res.json(returnCode.UNCHECK_ERROR(err));
         } else {
-            //判断是否需要加载是否点赞
-            var doGETPraise = false;
-            _.forEach(result.items, function(d, i) {
-                if(d.type === 1 && d.thread){//只有帖子需要
-                    doGETPraise = true;
-                }
-            });
-            if(!doGETPraise){
             util.loadLevel(req.session.user.ent_code,result.items,function(){
                 res.json(_.assign(result, returnCode.SUCCESS));
             });
         }
-            util.loadLevel(req.session.user.ent_code,result.items,function(){
-                redisPraiseLog.get(ent_code, user.getMobileUser(req), 'thread', function(error, docs) {
-                    _.forEach(result.items, function(d, i) {
-                        if(d.type === 1 && d.thread){//只有帖子需要
-                            if (result.items[i].toObject) {
-                                result.items[i] = result.items[i].toObject();
-                            }
-                            result.items[i].thread.isPraise = false;
-                            for (var k = docs.length - 1; k >= 0; k--) {
-                                if (result.items[i].thread._id == docs[k]) {
-                                    result.items[i].thread.isPraise = true;
-                                    break;
-                                }
-                            };
-                        }
-                    });
-                    res.json(_.assign(result, returnCode.SUCCESS));
-                });
-            });
-        }
     });
 });
 
@@ -100,37 +74,7 @@ router.get('/aboutme/he2other/:id/:entcode', function(req, res, next) {
         if (err) {
             res.json(returnCode.UNCHECK_ERROR(err));
         } else {
-            //判断是否需要加载是否点赞
-            var doGETPraise = false;
-            _.forEach(result.items, function(d, i) {
-                if(d.type === 1 && d.thread){//只有帖子需要
-                    doGETPraise = true;
-                }
-            });
-            if(!doGETPraise){
-                util.loadLevel(req.session.user.ent_code,result.items,function(){
-                    res.json(_.assign(result, returnCode.SUCCESS));
-                });
-            }
-            util.loadLevel(req.session.user.ent_code,result.items,function(){
-                redisPraiseLog.get(ent_code, user.getMobileUser(req), 'thread', function(error, docs) {
-                    _.forEach(result.items, function(d, i) {
-                        if(d.type === 1 && d.thread){//只有帖子需要
-                            if (result.items[i].toObject) {
-                                result.items[i] = result.items[i].toObject();
-                            }
-                            result.items[i].thread.isPraise = false;
-                            for (var k = docs.length - 1; k >= 0; k--) {
-                                if (result.items[i].thread._id == docs[k]) {
-                                    result.items[i].thread.isPraise = true;
-                                    break;
-                                }
-                            };
-                        }
-                    });
             res.json(_.assign(result, returnCode.SUCCESS));
-                });
-            });
         }
     });
 });

app/controllers/mobile/forumInfo.js

@@ -562,9 +562,24 @@ router.get('/info/hisThreads/:id', function(req, res, next) {
                     console.error(err);
                     res.json(returnCode.BUSY);
                 } else {
+                    //判断是否已经点赞
                     util.loadLevel(req.session.user.ent_code, results.items, function() {
+                        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));
                         });
+                    });
                 }
             });
         }