Merge commit '42c90310' into SANDBOX

app/controllers/admin/forumThread.js

@@ -401,6 +401,10 @@ router.get('/threads/list', function(req, res, next) {
     var begin_time=req.query.begin_time;
     var end_time=req.query.end_time;
     var title = req.query.title;
+
+    //update by Car 20160315 帖子管理增加查询条件查询后台发的帖
+    var isPublishByBg = req.query.isPublishByBg;
+
     var sortBy = {
         top:-1,
         top_order_idx:-1,
@@ -495,6 +499,16 @@ router.get('/threads/list', function(req, res, next) {
         }
     }
 
+    if(isPublishByBg){
+        if(isPublishByBg == 1){
+            conditions.isPublishByBg = isPublishByBg;
+        }else if(isPublishByBg == 0){
+            conditions.isPublishByBg = {$ne:1};
+        }
+    }
+
+
+
     if (mid) {
         forumThreadService.getAllThreadByFidAndMid(mid, conditions, pageNo, pageSize, sortBy, function(err, results) {
             if (err) {