11

app/controllers/admin/forumThread.js

@@ -226,6 +226,8 @@ router.get('/threads/list', function(req, res, next) {
     var tagId = req.query.tagId;
     var pid = req.query.pid;
     var content = req.query.content;
+    var type = req.query.type;
+    var status = req.query.status;
     var conditions = {
         ent_code: req.session.user.ent_code,
         level: 1
@@ -250,15 +252,21 @@ router.get('/threads/list', function(req, res, next) {
             $options: 'i'
         }
     }
+    if(type){
+        conditions.type = type;
+    }
 
+    if(status){
+        conditions.status = status;
+    }
     forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, null, function(err, results) {
         if (err) {
             console.error(err);
             res.json(returnCode.BUSY);
         } else {
 
-            if (results.items.length > 0 && results.items[0].pid) {
-                forumThreadService.getById(results.items[0].pid, function(err, parentThread) {
+            if (pid) {
+                forumThreadService.getById(pid, function(err, parentThread) {
                     res.json(_.assign({
                         parentThread: parentThread
                     }, results, returnCode.SUCCESS));