Merge remote-tracking branch 'origin/master'

vue-fastapi-backend/module_admin/service/metasecurity_service.py

@@ -307,7 +307,9 @@ class MetaSecurityService:
         # await test_connection(dbConnent)
         #3获取sql中涉及的表名
         sqlScheamAndTable =await get_tables_from_sql(page_object.sqlStr)
-        oldStrSql=generate_pagination_sql(page_object,dsDataResource["type"])
+        oldStrSql= page_object.sqlStr
+        if page_object.isPage:
+            oldStrSql=generate_pagination_sql(page_object,dsDataResource["type"])
         #4.执行原始sql
         result = await cls.execute_sql(dbConnent, oldStrSql,"原始")
         if 3 in role_id_list: