zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

This commit is contained in:
shilixia 2021-08-06 15:08:08 +08:00
parent 0d8755cb1e 9ff8d3106c
commit 7ece1d5e41
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/apps/ability/views.py
View File

@ -28,7 +28,7 @@ class RecordMixin():
`request.user` or `request.auth` is accessed.
"""
if request.user and request.method == 'GET' and request.user.username != 'admin':
QueryRecord.objects.create(user=user,path=request.path,ip=request.META.get('HTTP_X_FORWARDED_FOR'),method=\
QueryRecord.objects.create(user=request.user,path=request.path,ip=request.META.get('HTTP_X_FORWARDED_FOR'),method=\
request.method,search=request.query_params.get('search',None),query=request.query_params)
class QueryRecordListViewSet(ListModelMixin, GenericViewSet):
@ -684,7 +684,7 @@ def import_correct(path):
data['bclxh'] = sheet['e'+str(i)].value
defaultv['bclxh'] = data['bclxh']
else:
data['bclxh'] = defaultv['bclxh']
data['bclxh'] = defaultv['bclxh'] if 'bclxh' in defaultv else None
if sheet['f'+str(i)].value:
data['bclmc'] = sheet['f'+str(i)].value
defaultv['bclmc'] = data['bclmc']