From f5487850147228e28bef748641dad0565d1b0a6c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 19 Mar 2024 13:15:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20dataset=20exec=20query=20update=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/bi/views.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/bi/views.py b/apps/bi/views.py index e47e265d..47e0cbd1 100644 --- a/apps/bi/views.py +++ b/apps/bi/views.py @@ -62,16 +62,17 @@ class DatasetViewSet(CustomModelViewSet): """ dt: Dataset = self.get_object() rdata = DatasetSerializer(instance=dt).data - query = request.data.get('query', {}) + xquery = request.data.get('query', {}) is_test = request.data.get('is_test', False) raise_exception = request.data.get('raise_exception', False) - query['r_user'] = request.user.id - query['r_dept'] = request.user.belong_dept.id if request.user.belong_dept else '' + xquery['r_user'] = request.user.id + xquery['r_dept'] = request.user.belong_dept.id if request.user.belong_dept else '' results = {} results2 = {} can_cache = True - + query = dt.default_param if dt.sql_query: + query.update(xquery) try: if dt.default_param: query.update(dt.default_param)