diff --git a/plugins/data_query/sql_mysql.py b/plugins/data_query/sql_mysql.py
index dff655c9f..3de3920aa 100755
--- a/plugins/data_query/sql_mysql.py
+++ b/plugins/data_query/sql_mysql.py
@@ -167,6 +167,19 @@ class nosqlMySQLCtr():
         sid = args['sid']
         db = args['db']
         table = args['table']
+        if table == '':
+            page_args = {}
+            page_args['count'] = 0
+            page_args['tojs'] = 'mysqlGetDataList'
+            page_args['p'] = 1
+            page_args['row'] = 10
+
+            rdata = {}
+            rdata['page'] = mw.getPage(page_args)
+            rdata['list'] = []
+            rdata['count'] = 0
+            return mw.returnData(True,'ok', rdata)
+
         p = 1
         size = 10
         if 'p' in args:
@@ -223,6 +236,7 @@ class nosqlMySQLCtr():
         rdata['soso_field'] = ''
         if 'field' in args_where:
             rdata['soso_field'] = args_where['field']
+
         return mw.returnData(True,'ok', rdata)
 
     def showProcessList(self,args):
diff --git a/plugins/data_query/static/html/index.html b/plugins/data_query/static/html/index.html
index ab943d3a6..bd3bf3ce2 100644
--- a/plugins/data_query/static/html/index.html
+++ b/plugins/data_query/static/html/index.html
@@ -135,7 +135,7 @@
                         </div>
                     </div>
 
-                    <div class="pull-right" style="padding-top: 5px;">
+                    <div id="mongodb_select" class="pull-right" style="padding-top: 5px;">
                         <div class="server_list" style="float:left;">
                             <select name="sid" class="bt-input-text c5 mr5">
                                 <option value="0">本地服务器</option>
diff --git a/plugins/data_query/static/js/app.js b/plugins/data_query/static/js/app.js
index 1e75b636a..18a32fec9 100755
--- a/plugins/data_query/static/js/app.js
+++ b/plugins/data_query/static/js/app.js
@@ -227,7 +227,6 @@ function initTabMongodb(){
 }
 
 
-
 function initTabMemcached(){
     memcachedGetList();
 
@@ -288,7 +287,11 @@ function mysqlGetDbName(){
 }
 
 function mysqlGetTableName(){
-    return $('#mysql .mysql_table_list select[name=mysql_table]').val();
+    var table = $('#mysql .mysql_table_list select[name=mysql_table]').val();
+    if (!table){
+        return '';
+    }
+    return table;
 }
 
 function mysqlInitField(f, data){
@@ -397,7 +400,7 @@ function mysqlGetDataList(p){
     } else {
         request_data['where'] = {};
     }
-    // console.log(request_data);
+
     myPostCB('get_data_list',request_data ,function(rdata){
 
         if (rdata.data.status){
@@ -758,6 +761,7 @@ function mongodbCollectionName(){
 function mongodbGetList(){
     var sid = mongodbGetSid();
     mgdbPostCB('get_db_list',{'sid':sid} ,function(rdata){
+        console.log(rdata);
         if (rdata.data.status){
             var list = rdata.data.data['list'];
             var content = '';
@@ -772,9 +776,15 @@ function mongodbGetList(){
             $('.db_list select').html(content);
 
             if (list.length > 0) {
+                console.log('mongodbGetCollections:'+list[0]);
                 mongodbGetCollections(list[0]);
             }
 
+            $('#mongodb_select .db_list select[name="db"]').change(function(){
+                var collection_name = $(this).val();
+                mongodbGetCollections(collection_name);
+            });
+
             closeInstallLayer();
         } else {
             showInstallLayer();
@@ -787,6 +797,8 @@ function mongodbGetCollections(name){
     var sid = mongodbGetSid();
     
     mgdbPostCB('get_collections_list',{'sid':sid,'name':name} ,function(rdata){
+
+        console.log(rdata);
         if (rdata.data.status){
             var list = rdata.data.data['collections'];