diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index ff33350..7933916 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -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): @@ -682,9 +682,9 @@ def import_correct(path): data['lbmc'] = defaultv['lbmc'] if sheet['e'+str(i)].value: data['bclxh'] = sheet['e'+str(i)].value - defaultv['bclxh'] = data['bclxh'] + 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']