diff --git a/apps/hrm/views.py b/apps/hrm/views.py index a08e484b..37ca64a6 100755 --- a/apps/hrm/views.py +++ b/apps/hrm/views.py @@ -40,6 +40,18 @@ class EmployeeViewSet(CustomModelViewSet): search_fields = ['name', 'number', 'user__username'] ordering = ['-pk'] + @action(methods=['get'], detail=False, perms_map={'get': '*'}, + serializer_class=serializers.Serializer) + def info(self, request, pk=None): + """个人信息 + + 个人信息 + """ + user = request.user + if user.employee: + return Response(EmployeeSerializer(instance=user.employee).data) + raise ParseError('请先完善个人信息') + @action(methods=['post'], detail=True, perms_map={'post': 'employee:notworkremark'}, serializer_class=EmployeeNotWorkRemarkSerializer) def not_work_remark(self, request, pk=None): diff --git a/apps/vm/serializers.py b/apps/vm/serializers.py index a806a005..353fc284 100644 --- a/apps/vm/serializers.py +++ b/apps/vm/serializers.py @@ -9,7 +9,7 @@ from rest_framework import serializers class VisitCreateUpdateSerializer(CustomModelSerializer): class Meta: model = Visit - fields = ['purpose', 'name', 'description', 'visit_time', 'leave_time', 'receptionist', 'company'] + fields = ['purpose', 'name', 'description', 'visit_time', 'leave_time', 'receptionist', 'company', 'level', 'count_people'] class VisitSerializer(CustomModelSerializer): diff --git a/apps/vm/views.py b/apps/vm/views.py index 6143acc5..bb90c2b1 100644 --- a/apps/vm/views.py +++ b/apps/vm/views.py @@ -53,6 +53,13 @@ class VisitorViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Custo create_serializer_class = VisitorCreateSerializer serializer_class = VisitorSerializer + def get_queryset(self): + user = self.request.user + queryset = super().get_queryset() + if user.type == 'visitor': + queryset = queryset.filter(create_by=user) + return queryset + @action(methods=['post'], detail=False, authentication_classes=[], permission_classes=[], serializer_class=VisitorRegisterSerializer)