zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opl_audit_end bug

This commit is contained in:
曹前明 2022-07-22 13:12:45 +08:00
parent 028cba10e8
commit ef092efc6e
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/auth1/authentication.py
View File

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

2
apps/hrm/serializers.py
View File

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

2
apps/hrm/views.py
View File

@ -66,7 +66,7 @@ class EmployeeViewSet(CustomModelViewSet):
}) })
return Response(EmployeeSerializer(instance=user.employee).data) 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) serializer_class=EmployeeImproveSerializer)
@transaction.atomic @transaction.atomic
def improve_info(self, request, *args, **kwargs): def improve_info(self, request, *args, **kwargs):

2
apps/opm/services.py
View File

@ -52,7 +52,7 @@ def bind_opl(ticket: Ticket, transition: Transition, new_ticket_data: dict):
op.save() 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) opl = Opl.objects.get(ticket=ticket)
op = opl.operation op = opl.operation

5
apps/system/views.py
View File

@ -457,9 +457,12 @@ class UserViewSet(CustomModelViewSet):
'username': user.username, 'username': user.username,
'type': user.type, 'type': user.type,
'name': user.name, 'name': user.name,
'posts': user.posts.values_list('name', flat=True), 'roles': user.roles.values_list('name', flat=True),
'avatar': user.avatar, 'avatar': user.avatar,
'perms': perms, '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) return Response(data)