diff --git a/backend/dvadmin/system/views/role_menu_button_permission.py b/backend/dvadmin/system/views/role_menu_button_permission.py index 07fd917..b86952c 100644 --- a/backend/dvadmin/system/views/role_menu_button_permission.py +++ b/backend/dvadmin/system/views/role_menu_button_permission.py @@ -238,7 +238,11 @@ class RoleMenuButtonPermissionViewSet(CustomModelViewSet): instance = RoleMenuButtonPermission.objects.create(role_id=pk, menu_button_id=btn.get('id'),data_range=data_range) instance.dept.set(btn.get('dept',[])) for col in menu.get('columns', []): - FieldPermission.objects.update_or_create(role_id=pk,field_id=col.get('id'),is_query=col.get('is_query'),is_create=col.get('is_create'),is_update=col.get('is_update')) + FieldPermission.objects.update_or_create(role_id=pk,field_id=col.get('id'),defaults={ + "is_query":col.get('is_query'), + "is_create":col.get('is_create'), + "is_update":col.get('is_update') + }) return DetailResponse(msg="授权成功") diff --git a/web/src/views/system/user/crud.tsx b/web/src/views/system/user/crud.tsx index 1e28bb8..7281525 100644 --- a/web/src/views/system/user/crud.tsx +++ b/web/src/views/system/user/crud.tsx @@ -349,7 +349,7 @@ export const createCrudOptions = function ({crudExpose}: CreateCrudOptionsProps) }, }, is_active: { - title: '锁定', + title: '状态', search: { show: true, },