opl_audit_end bug

apps/auth1/authentication.py

@@ -13,7 +13,7 @@ class CustomBackend(ModelBackend):
             return
         try:
             user = UserModel._default_manager.get(
-                Q(username=username) | Q(email=username))
+                Q(username=username) | Q(phone=username) | Q(employee__id_number=username))
         except UserModel.DoesNotExist:
             # Run the default password hasher once to reduce the timing
             # difference between an existing and a nonexistent user (#20760).

apps/hrm/serializers.py

@@ -45,7 +45,7 @@ def phone_check(phone):
 class EmployeeImproveSerializer(CustomModelSerializer):
     class Meta:
         model = Employee
-        fields = ['phone', 'number', 'photo', 'id_number']
+        fields = ['phone', 'email']
 
 
 class EmployeeCreateUpdateSerializer(EmployeeBaseSerializer):

apps/hrm/views.py

@@ -66,7 +66,7 @@ class EmployeeViewSet(CustomModelViewSet):
                                        })
         return Response(EmployeeSerializer(instance=user.employee).data)
 
-    @action(methods=['post'], detail=True, permission_classes=[IsAuthenticated],
+    @action(methods=['post'], detail=False, permission_classes=[IsAuthenticated],
             serializer_class=EmployeeImproveSerializer)
     @transaction.atomic
     def improve_info(self, request, *args, **kwargs):

apps/opm/services.py

@@ -52,7 +52,7 @@ def bind_opl(ticket: Ticket, transition: Transition, new_ticket_data: dict):
         op.save()
 
 
-def opl_audit_end(ticket: Ticket, transition: Transition, new_ticket_data: dict):
+def opl_audit_end(ticket: Ticket):
     opl = Opl.objects.get(ticket=ticket)
 
     op = opl.operation

apps/system/views.py

@@ -457,9 +457,12 @@ class UserViewSet(CustomModelViewSet):
             'username': user.username,
             'type': user.type,
             'name': user.name,
-            'posts': user.posts.values_list('name', flat=True),
+            'roles': user.roles.values_list('name', flat=True),
             'avatar': user.avatar,
             'perms': perms,
+            'belong_dept_name': user.belong_dept.name if user.belong_dept else '',
+            'post_name': user.post.name if user.post else '',
+            'is_superuser': user.is_superuser
         }
         return Response(data)