Merge branch 'newfunc_0510_forum_management' into SANDBOX

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
         };