From 07267bc151960baf2982b7ee2ce14d66e69ad0b5 Mon Sep 17 00:00:00 2001
From: sichan <sichanwong0527@gmail.com>
Date: Wed, 5 Jun 2024 23:29:00 +0800
Subject: [PATCH] commit

---
 application/accounts/views.py                 |  25 +++++++++++-------
 ...�力资源管理-人员基本信息-Excel上传模板.xlsx | Bin 0 -> 5388 bytes
 templates/authority_modal.html                |   8 +++---
 3 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 static/excels/人力资源管理-人员基本信息-Excel上传模板.xlsx

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 0000000000000000000000000000000000000000..b91290b46d29129617e283dcc8f30553fd76c855
GIT binary patch
literal 5388
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

literal 0
HcmV?d00001

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() {
                 <tr>
                     <td>${perm.resource_group}</td>
                     <td>${perm.resource}</td>
-                    <td><input type="checkbox" name="add_permission" data-id="${perm.id}" ${perm.add ? 'checked' : ''}></td>
-                    <td><input type="checkbox" name="delete_permission" data-id="${perm.id}" ${perm.remove ? 'checked' : ''}></td>
-                    <td><input type="checkbox" name="edit_permission" data-id="${perm.id}" ${perm.change ? 'checked' : ''}></td>
-                    <td><input type="checkbox" name="view_permission" data-id="${perm.id}" ${perm.view ? 'checked' : ''}></td>
+                    <td><input type="checkbox" name="add_permission" data-id="${perm.add.id}" ${perm.add.has_permission ? 'checked' : ''}></td>
+                    <td><input type="checkbox" name="delete_permission" data-id="${perm.remove.id}" ${perm.remove.has_permission ? 'checked' : ''}></td>
+                    <td><input type="checkbox" name="edit_permission" data-id="${perm.change.id}" ${perm.change.has_permission ? 'checked' : ''}></td>
+                    <td><input type="checkbox" name="view_permission" data-id="${perm.view.id}" ${perm.view.has_permission ? 'checked' : ''}></td>
                 </tr>
             `);
         });