From e8d39d01508a69189c61ae37867e76f83214896a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com> Date: Tue, 21 May 2024 21:48:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=88=E6=9D=83=E7=AE=A1=E7=90=86=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/dvadmin/system/views/role_menu_button_permission.py | 6 +++++- web/src/views/system/user/crud.tsx | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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, },