@@ -1000,26 +1000,26 @@ def run_task(self, in_chat: bool = True):
1000
1000
sqlbot_temp_sql_text = None
1001
1001
assistant_dynamic_sql = None
1002
1002
# todo row permission
1003
- if (not self .current_assistant or is_page_embedded ) or use_dynamic_ds :
1003
+ if ((not self .current_assistant or is_page_embedded ) and is_normal_user (
1004
+ self .current_user )) or use_dynamic_ds :
1004
1005
sql , tables = self .check_sql (res = full_sql_text )
1005
1006
sql_result = None
1006
1007
1007
- if is_normal_user (self .current_user ):
1008
- if use_dynamic_ds :
1009
- dynamic_sql_result = self .generate_assistant_dynamic_sql (sql , tables )
1010
- sqlbot_temp_sql_text = dynamic_sql_result .get (
1011
- 'sqlbot_temp_sql_text' ) if dynamic_sql_result else None
1012
- # sql_result = self.generate_assistant_filter(sql, tables)
1013
- else :
1014
- sql_result = self .generate_filter (sql , tables ) # maybe no sql and tables
1015
-
1016
- if sql_result :
1017
- SQLBotLogUtil .info (sql_result )
1018
- sql = self .check_save_sql (res = sql_result )
1019
- elif dynamic_sql_result and sqlbot_temp_sql_text :
1020
- assistant_dynamic_sql = self .check_save_sql (res = sqlbot_temp_sql_text )
1021
- else :
1022
- sql = self .check_save_sql (res = full_sql_text )
1008
+ if use_dynamic_ds :
1009
+ dynamic_sql_result = self .generate_assistant_dynamic_sql (sql , tables )
1010
+ sqlbot_temp_sql_text = dynamic_sql_result .get (
1011
+ 'sqlbot_temp_sql_text' ) if dynamic_sql_result else None
1012
+ # sql_result = self.generate_assistant_filter(sql, tables)
1013
+ else :
1014
+ sql_result = self .generate_filter (sql , tables ) # maybe no sql and tables
1015
+
1016
+ if sql_result :
1017
+ SQLBotLogUtil .info (sql_result )
1018
+ sql = self .check_save_sql (res = sql_result )
1019
+ elif dynamic_sql_result and sqlbot_temp_sql_text :
1020
+ assistant_dynamic_sql = self .check_save_sql (res = sqlbot_temp_sql_text )
1021
+ else :
1022
+ sql = self .check_save_sql (res = full_sql_text )
1023
1023
else :
1024
1024
sql = self .check_save_sql (res = full_sql_text )
1025
1025
tables = []
0 commit comments