Merge branch 'newfunc_0510_forum_management' into SANDBOX

app/controllers/admin/forumThreadManagement.js

@@ -6,6 +6,9 @@ var router = require('express').Router(),
     then = require('thenjs'),
     moment = require('moment'),
     mongoose = require('mongoose'),
+    util = require('../../utils/util'),
+    user = require('../../utils/user'),
+    redisPraiseLog = require('../../utils/redisPraiseLog'),
     async = require('async');
 //模型    
 var ForumThread = mongoose.model('ForumThread'),
@@ -897,6 +900,7 @@ router.get('/threadManagement/threads/:tid/comment/search', function(req, res, n
     var tid = req.params.tid || null,
         pageNo = req.query.pageNo || 1,
         pageSize = req.query.pageSize || 10,
+        ent_code = req.session.user.ent_code,
         mid = req.query.mid,
         floor_start = req.query.floor_start,
         floor_end = req.query.floor_end,
@@ -912,7 +916,7 @@ router.get('/threadManagement/threads/:tid/comment/search', function(req, res, n
     }
 
     var conditions = {
-        ent_code: req.session.user.ent_code,
+        ent_code: ent_code,
         thread: tid,
         level:1,
         status:{
@@ -945,7 +949,25 @@ router.get('/threadManagement/threads/:tid/comment/search', function(req, res, n
                 console.error(err);
                 res.json(returnCode.BUSY);
             } else {
-                res.json(_.assign(results, returnCode.SUCCESS));
+                //判断是否已经点赞
+                util.loadLevel(ent_code, results.items, function() {
+                    redisPraiseLog.get(ent_code, user.getMobileUser(req), 'comment', 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));
+                    });
+                });
+                // res.json(_.assign(results, returnCode.SUCCESS));
             }
         });
     } else if(tid){
@@ -954,7 +976,25 @@ router.get('/threadManagement/threads/:tid/comment/search', function(req, res, n
                 console.log(err);
                 res.json(returnCode.BUSY);
             } else {
-                res.json(_.assign(results, returnCode.SUCCESS));
+                //判断是否已经点赞
+                util.loadLevel(ent_code, results.items, function() {
+                    redisPraiseLog.get(ent_code, user.getMobileUser(req), 'comment', 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));
+                    });
+                });
+                // res.json(_.assign(results, returnCode.SUCCESS));
             }
         });
     } else {