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)