修改社区文章评论列表，录入了会员编号查询条件后，楼层的查询条件被隐藏

app/controllers/admin/forumThread.js

@@ -609,6 +609,92 @@ router.get('/thread/:tid/comment/list/member/:mid', function(req, res, next) {
     }
 });
 
+//查询评论列表
+router.get('/thread/:tid/comment/listV2', function(req, res, next) {
+    var tid = req.params.tid || null,
+        pageNo = req.query.pageNo || 1,
+        pageSize = req.query.pageSize || 10,
+        mid = req.query.mid,
+        floor = req.query.floor,
+        content = req.query.content || '';
+    var conditions = {
+        ent_code: req.session.user.ent_code,
+        thread: tid
+    };
+    if (content) {
+        conditions.content = {
+            $regex: content,
+            $options: 'i'
+        };
+    }
+
+    if(floor){
+        conditions.level = '1';
+        conditions.floor = floor;
+    }
+
+    if (tid && mid) {
+        forumCommentService.getCommentListByMid(mid, conditions, pageNo, pageSize, function(err, results) {
+            if (err) {
+                console.error(err);
+                res.json(returnCode.BUSY);
+            } else {
+                var asyncTasks = [];
+                if (results.items && results.items[0] && results.items[0].comments.length > 0) {
+                    var items = [results.items[0]];
+                    _.forEach(results.items[0].comments, function(e) {
+                        var subComment = e.toObject();
+                        subComment.floor = results.items[0].floor;
+                        if (content) {
+                            if (subComment.content.indexOf(content) != -1) {
+                                items.push(subComment);
+                            }
+                        } else {
+                            items.push(subComment);
+                        }
+                    });
+                    results.items = items;
+                    results.total = items.length;
+                    res.json(_.assign(results, returnCode.SUCCESS));
+                } else {
+                    res.json(_.assign(results, returnCode.SUCCESS));
+                }
+            }
+        });
+    } else if(tid && floor){
+        forumCommentService.getAllComment(conditions, 1, 1, function(err, results) {
+            if (err) {
+                console.log(err);
+                res.json(returnCode.BUSY);
+            } else {
+                var asyncTasks = [];
+                if (results.items && results.items[0] && results.items[0].comments.length > 0) {
+                    var items = [results.items[0]];
+                    _.forEach(results.items[0].comments, function(e) {
+                        var subComment = e.toObject();
+                        subComment.floor = results.items[0].floor;
+                        if (content) {
+                            if (subComment.content.indexOf(content) != -1) {
+                                items.push(subComment);
+                            }
+                        } else {
+                            items.push(subComment);
+                        }
+                    });
+                    results.items = items;
+                    results.total = items.length;
+                    res.json(_.assign(results, returnCode.SUCCESS));
+                } else {
+                    res.json(_.assign(results, returnCode.SUCCESS));
+                }
+            }
+        });
+    } else {
+        res.json(returnCode.WRONG_PARAM);
+    }
+});
+
+
 // 更新评论状态
 router.post('/thread/comment/update/:cid', function(req, res, next) {
     var cid = req.params.cid || null;

app/service/forumCommentService.js

@@ -350,6 +350,7 @@ exports.getCommentList = function(conditions, pageNo, pageSize, callback) {
     });
 };
 //获取评论列表 
+//获取评论列表 
 exports.getCommentListByMid = function(mid,conditions, pageNo, pageSize, callback) {
     //查询到用户
     forumUserService.searchMembersByMid(mid, function(err, users) {
@@ -365,6 +366,7 @@ exports.getCommentListByMid = function(mid,conditions, pageNo, pageSize, callbac
             conditions.from = {
                 $in:user_ids
             }
+
             countAll(conditions, function(err, count) {
                 if (err) {
                     callback(err);
@@ -383,7 +385,34 @@ exports.getCommentListByMid = function(mid,conditions, pageNo, pageSize, callbac
                             obj.pageSize = pageSize;
                             obj.items = docs;
 
-                            callback(null, obj);
+                            if (docs && docs.length > 0) {
+                                var asyncTasks = [];
+                                docs.forEach(function(doc) {
+                                    asyncTasks.push(function(callback) {
+                                        populateComment(doc, function(err, c) {
+                                            if (err) {
+                                                callback(err, null);
+                                            } else {
+                                                var newobj = doc.toObject();
+                                                newobj.comments = (c == null ? [] : c);
+                                                callback(null, newobj);
+                                            }
+                                        });
+                                    });
+                                });
+                                async.parallel(asyncTasks, function(err, results) {
+                                    if (err) {
+                                        console.log(err);
+                                        callback(null, null);
+                                    } else {
+                                        obj.items = results;
+                                        callback(null, obj);
+                                    }
+                                });
+
+                            } else {
+                                callback(null, obj);
+                            }
                         }
                     });
                 }