Merge branch 'newfunc_0510_forum_management' into SANDBOX

37de930b · 陈家荣 · 0504b3ab · a7a13c85 · 37de930b
Commit 37de930b authored Jul 04, 2016 by 陈家荣
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

forumThreadManagement.js app/controllers/admin/forumThreadManagement.js +7 -3

No files found.
--- a/app/controllers/admin/forumThreadManagement.js
+++ b/app/controllers/admin/forumThreadManagement.js
@@ -923,12 +923,16 @@ router.get('/threadManagement/threads/:tid/comment/search', function(req, res, n
            $options: 'i'
        };
    }
-    if(floor_start){
+    if(floor_start && floor_end){
+        conditions.floor = {
+            $gte:floor_start,
+            $lte:floor_end
+        };
+    }else if(floor_start){
        conditions.floor = {
            $gte:floor_start
        };
-    }
-    if(floor_end){
+    }else if(floor_end){
        conditions.floor = {
            $lte:floor_end
        };