From 48b7267bb13a17185566f052e24f5bf655e5fb1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 7 Jun 2022 09:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/apps/ability/views_qtask.py |  6 +++---
 server/apps/system/views.py        | 23 +++++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/server/apps/ability/views_qtask.py b/server/apps/ability/views_qtask.py
index 22cbf2e..a90a079 100644
--- a/server/apps/ability/views_qtask.py
+++ b/server/apps/ability/views_qtask.py
@@ -198,7 +198,7 @@ class QActionViewSet(PageOrNot, ListModelMixin, DestroyModelMixin, RetrieveModel
         return Response()
     
     @action(methods=['post'], detail=False,
-            perms_map = {'post':'ability_create'}, serializer_class=QActionACreateSerializer)
+            perms_map = {'post':'qaction_create'}, serializer_class=QActionACreateSerializer)
     @transaction.atomic
     def ability_create(self, request, *args, **kwargs):
         """
@@ -213,7 +213,7 @@ class QActionViewSet(PageOrNot, ListModelMixin, DestroyModelMixin, RetrieveModel
         return Response()
 
     @action(methods=['post'], detail=False,
-            perms_map = {'post':'ability_nochange'}, serializer_class=QActionNoChangeSerializer)
+            perms_map = {'post':'qaction_create'}, serializer_class=QActionNoChangeSerializer)
     @transaction.atomic
     def ability_nochange(self, request, *args, **kwargs):
         """
@@ -228,7 +228,7 @@ class QActionViewSet(PageOrNot, ListModelMixin, DestroyModelMixin, RetrieveModel
         return Response()
     
     @action(methods=['post'], detail=False,
-            perms_map = {'post':'quali_nochange'}, serializer_class=QActionNoChangeSerializer)
+            perms_map = {'post':'qaction_create'}, serializer_class=QActionNoChangeSerializer)
     @transaction.atomic
     def quali_nochange(self, request, *args, **kwargs):
         """
diff --git a/server/apps/system/views.py b/server/apps/system/views.py
index 9c14ed4..9124c99 100644
--- a/server/apps/system/views.py
+++ b/server/apps/system/views.py
@@ -378,25 +378,28 @@ class UserViewSet(PageOrNot, ModelViewSet):
         i = 3
         role1 = Role.objects.get(name='能力查询')
         role2 = Role.objects.get(name='资质能力报送')
-        role3 = Role.objects.get(name='资料分享和视频培训')
+        role3 = Role.objects.get(name='资料分享')
+        role4 = Role.objects.get(name='视频培训')
         while sheet['b'+str(i)].value:
             name = sheet['b'+str(i)].value
             email = sheet['e'+str(i)].value
             if not User.objects.filter(username=email).exists():
-                dept = Organization.objects.get(name=sheet['j'+str(i)].value)
                 user = User.objects.create(name=name,
                                            username=email,
                                            password=make_password(''.join(random.sample(string.ascii_letters + string.digits, 8))),
                                            dept=dept)
-                if sheet['f'+str(i)].value:
-                    user.roles.add(role1)
-                if sheet['g'+str(i)].value:
-                    user.roles.add(role2)
-                if sheet['h'+str(i)].value:
-                    user.roles.add(role3)
-                print(str(i)+name+'已导入')
             else:
-                print(str(i)+name+'已存在')
+                user = User.objects.get(username=email)
+            dept = Organization.objects.get(name=sheet['j'+str(i)].value)
+            if sheet['f'+str(i)].value:
+                user.roles.add(role1)
+            if sheet['g'+str(i)].value:
+                user.roles.add(role2)
+            if sheet['h'+str(i)].value:
+                user.roles.add(role3)
+            if sheet['i'+str(i)].value:
+                user.roles.add(role4)
+            print(str(i)+name+'已导入')
             i = i + 1
         return Response()