Merge remote-tracking branch 'origin/master'

1 week ago · 834dc94935
1 changed files with 3 additions and 1 deletions
--- a/vue-fastapi-backend/module_admin/service/metasecurity_service.py
+++ b/vue-fastapi-backend/module_admin/service/metasecurity_service.py
@ -307,6 +307,8 @@ class MetaSecurityService:
        # await test_connection(dbConnent)
        #3获取sql中涉及的表名
        sqlScheamAndTable =await get_tables_from_sql(page_object.sqlStr)
+        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,"原始")