更新圈子和板块首页话题数不一样BUG，新增不带板块ID搜索帖子接口

app/controllers/mobile/forumInfo.js

@@ -796,6 +796,7 @@ router.get('/info/myAttend', function(req, res, next) {
 router.get('/info/list/allWithThreadCount', function(req, res, next) {
     var rs = {};
     var ent_code = req.session.user.ent_code;
+    var today = new Date();
     async.waterfall([
         function(callback) {
             forumInfoService.getAllByGid({ent_code: ent_code}, 1, 100, function(err, datas) {
@@ -808,7 +809,17 @@ router.get('/info/list/allWithThreadCount', function(req, res, next) {
                 asyncTasks.push(function(cont) {
                     var conditions = {
                         ent_code: ent_code,
-                        info: info._id
+                        info: info._id,
+                        level: 1,
+                        status: 1,
+                        $or: [{
+                            isEvent: 0
+                        }, {
+                            isEvent: null
+                        }, {
+                            isEvent: 1,
+                            'event.eventStartTime' : {$lte : today}
+                        }]
                     };
                     forumThreadService.getAllCountByFid(conditions, function(err, count) {
                         if (err) {
@@ -842,4 +853,86 @@ router.get('/info/list/allWithThreadCount', function(req, res, next) {
             res.json(_.assign(rs, returnCode.SUCCESS));
         }
     });
+});
+
+//搜索文章列表，不带板块ID
+router.get('/info/serachThreads', function(req, res, next) {
+    var pageNo = req.query.pageNo || 1;
+    var pageSize = req.query.pageSize || 10;
+    var content = req.query.content;
+    var ent_code = req.session.user.ent_code;
+    var today = new Date();
+    var conditions = {
+        ent_code: ent_code,
+        status: 1,
+        $or: [{
+            isEvent: 0
+        }, {
+            isEvent: null
+        }, {
+            isEvent: 1,
+            'event.eventStartTime' : {$lte : today}
+        }]
+    };
+
+    if (content) {
+        conditions.content = {
+            $regex: content,
+            $options: 'i'
+        };
+    }
+
+    async.waterfall([
+        function(callback) {
+            forumUserThreadControlService.getUserThreadControlById(user.getMobileUser(req), function(err, doc) {
+                if (err) {
+                    callback(err, null);
+                } else {
+                    if (doc) {
+                        callback(null, doc);
+                    } else {
+                        callback(null, null);
+                    }
+                }
+            });
+        }
+    ], function(err, result) {
+        if (err) {
+            console.error(err);
+            res.json(returnCode.BUSY);
+        } else {
+            if (result) {
+                conditions._id = {
+                    $nin: result.thread
+                };
+            }
+            //获取子话题数据
+            forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-praise_count', function(err, results) {
+                if (err) {
+                    console.error(err);
+                    res.json(returnCode.BUSY);
+                } else {
+                    //判断是否已经点赞
+                    util.loadLevel(req.session.user.ent_code, results.items, function() {
+                        redisPraiseLog.get(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));
+                        });
+                    });
+
+                }
+            });
+        }
+    });
 });
\ No newline at end of file