diff --git a/application/accounts/views.py b/application/accounts/views.py index a56f2bb..a8a0cc1 100644 --- a/application/accounts/views.py +++ b/application/accounts/views.py @@ -182,25 +182,30 @@ def get_user_existing_permissions(request, user_id): if key not in processed_permissions: processed_permissions[key] = { - 'id': perm['id'], 'resource_group': perm['resource_group'], 'resource': perm['resource'], - 'add': False, - 'remove': False, - 'change': False, - 'view': False + 'add': {'id': None, 'has_permission': False}, + 'remove': {'id': None, 'has_permission': False}, + 'change': {'id': None, 'has_permission': False}, + 'view': {'id': None, 'has_permission': False} } if perm['permission'] == '新增': - processed_permissions[key]['add'] = perm['codename'] in user_permissions + processed_permissions[key]['add'] = {'id': perm['id'], 'has_permission': perm['codename'] in user_permissions} elif perm['permission'] == '删除': - processed_permissions[key]['remove'] = perm['codename'] in user_permissions + processed_permissions[key]['remove'] = {'id': perm['id'], 'has_permission': perm['codename'] in user_permissions} elif perm['permission'] == '修改': - processed_permissions[key]['change'] = perm['codename'] in user_permissions + processed_permissions[key]['change'] = {'id': perm['id'], 'has_permission': perm['codename'] in user_permissions} elif perm['permission'] == '查看': - processed_permissions[key]['view'] = perm['codename'] in user_permissions + processed_permissions[key]['view'] = {'id': perm['id'], 'has_permission': perm['codename'] in user_permissions} - return JsonResponse({'permissions': list(processed_permissions.values()), 'user_id': user_id}) + # 将processed_permissions从字典转换为列表 + permissions_list = [] + for key, perms in processed_permissions.items(): + perms['resource_group'], perms['resource'] = key + permissions_list.append(perms) + + return JsonResponse({'permissions': permissions_list, 'user_id': user_id}) @login_required diff --git a/static/excels/人力资源管理-人员基本信息-Excel上传模板.xlsx b/static/excels/人力资源管理-人员基本信息-Excel上传模板.xlsx new file mode 100644 index 0000000..b91290b Binary files /dev/null and b/static/excels/人力资源管理-人员基本信息-Excel上传模板.xlsx differ diff --git a/templates/authority_modal.html b/templates/authority_modal.html index f82a282..c81f56d 100644 --- a/templates/authority_modal.html +++ b/templates/authority_modal.html @@ -73,10 +73,10 @@ $(document).ready(function() { ${perm.resource_group} ${perm.resource} - - - - + + + + `); });