zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: dataset exec query update逻辑变化

This commit is contained in:
caoqianming 2024-03-19 13:15:41 +08:00
parent d05ee1595c
commit f548785014
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/bi/views.py
View File

@ -62,16 +62,17 @@ class DatasetViewSet(CustomModelViewSet):
""" """
dt: Dataset = self.get_object() dt: Dataset = self.get_object()
rdata = DatasetSerializer(instance=dt).data rdata = DatasetSerializer(instance=dt).data
query = request.data.get('query', {}) xquery = request.data.get('query', {})
is_test = request.data.get('is_test', False) is_test = request.data.get('is_test', False)
raise_exception = request.data.get('raise_exception', False) raise_exception = request.data.get('raise_exception', False)
query['r_user'] = request.user.id xquery['r_user'] = request.user.id
query['r_dept'] = request.user.belong_dept.id if request.user.belong_dept else '' xquery['r_dept'] = request.user.belong_dept.id if request.user.belong_dept else ''
results = {} results = {}
results2 = {} results2 = {}
can_cache = True can_cache = True
query = dt.default_param
if dt.sql_query: if dt.sql_query:
query.update(xquery)
try: try:
if dt.default_param: if dt.default_param:
query.update(dt.default_param) query.update(dt.default_param)