From ae7bdd76ef9ea904d1c0363e056cce94814005d8 Mon Sep 17 00:00:00 2001 From: 7nimor Date: Sat, 2 Aug 2025 07:54:12 +0330 Subject: [PATCH] update user_relations_excel --- .../services/excel/excel_processing.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/authorization/services/excel/excel_processing.py b/apps/authorization/services/excel/excel_processing.py index b4e29e4..8ffdd33 100644 --- a/apps/authorization/services/excel/excel_processing.py +++ b/apps/authorization/services/excel/excel_processing.py @@ -83,11 +83,19 @@ class AuthExcelViewSet(viewsets.ModelViewSet): city = str((data.get('user') or {}).get('city_name', '')) or '-' province = str((data.get('user') or {}).get('province_name', '')) or '-' city_province = f"{city}/{province}" if city != '-' or province != '-' else '-' - permission_name = [name for name in data['permission']['page_name']] - fa_permissions = [fa_permissions_dict.get(name, name) for name in permission_name] + try: + if data.get('permissions') and isinstance(data['permissions'], list): + permission_names = [] + for perm in data['permissions']: + if isinstance(perm, dict) and 'page_name' in perm: + permission_names.append(perm['page_name']) - # اگر لیست خالی بود، نمایش '-' - fa_permission_text = ' - '.join(fa_permissions) if fa_permissions else '-' + fa_permissions = [fa_permissions_dict.get(name, name) for name in permission_names] + fa_permission_text = ' - '.join(fa_permissions) if fa_permissions else '-' + else: + fa_permission_text = '-' + except (KeyError, TypeError): + fa_permission_text = '-' list1 = [ m,