diff --git a/apps/rpm/services.py b/apps/rpm/services.py index 06ad97b6..02828ecf 100644 --- a/apps/rpm/services.py +++ b/apps/rpm/services.py @@ -23,7 +23,7 @@ def rpj_audit_end(ticket): # 更新入厂项目人员库 for i in Rpjmember.objects.filter(rpj=rpj): rep = i.remployee - ep = Employee.objects.filter(id_number=rep.id_number, type='remployee').first() + ep = Employee.objects.filter(id_number=rep.id_number).first() if ep: pass else: @@ -32,6 +32,7 @@ def rpj_audit_end(ticket): ep.name = rep.name ep.phone = rep.phone ep.photo = rep.photo + ep.type = 'remployee' ep.save() rep.employee = ep rep.save() diff --git a/apps/system/views.py b/apps/system/views.py index d7ffde5e..6bf1ffc4 100755 --- a/apps/system/views.py +++ b/apps/system/views.py @@ -274,7 +274,8 @@ class PostViewSet(CustomModelViewSet): create_serializer_class = PostCreateUpdateSerializer update_serializer_class = PostCreateUpdateSerializer partial_update_serializer_class = PostCreateUpdateSerializer - search_fields = ['name', 'description'] + search_fields = ['name', 'code', 'description'] + ordering = ['create_time'] class PermissionViewSet(CustomModelViewSet): @@ -289,6 +290,7 @@ class PermissionViewSet(CustomModelViewSet): update_serializer_class = PermissionCreateUpdateSerializer partial_update_serializer_class = PermissionCreateUpdateSerializer search_fields = ['name', 'code'] + ordering = ['sort', 'create_time'] @action(methods=['get'], detail=False, permission_classes=[IsAuthenticated]) def codes(self, request, pk=None): @@ -312,6 +314,7 @@ class DeptViewSet(CustomModelViewSet): partial_update_serializer_class = DeptCreateUpdateSerializer filterset_fields = ['type'] search_fields = ['name'] + ordering = ['sort', 'create_time'] def filter_queryset(self, queryset): if not self.detail: @@ -339,6 +342,7 @@ class RoleViewSet(CustomModelViewSet): update_serializer_class = RoleCreateUpdateSerializer partial_update_serializer_class = RoleCreateUpdateSerializer search_fields = ['name', 'code'] + ordering = ['create_time'] class PostRoleViewSet(CreateModelMixin, DestroyModelMixin, ListModelMixin, CustomGenericViewSet): diff --git a/apps/vm/services.py b/apps/vm/services.py index 4abd054a..8f42e699 100644 --- a/apps/vm/services.py +++ b/apps/vm/services.py @@ -27,9 +27,9 @@ def visit_audit_end(ticket): for i in Vpeople.objects.filter(visit=visit): visitor = i.visitor if visitor.id_number and visitor.photo: - ep = Employee.objects.filter(id_number=visitor.id_number, type='visitor').first() + ep = Employee.objects.filter(id_number=visitor.id_number).first() else: - ep = Employee.objects.filter(name=visitor.name, type='visitor', id_number=None).first() + ep = Employee.objects.filter(name=visitor.name, id_number=None).first() if ep: pass else: @@ -39,6 +39,7 @@ def visit_audit_end(ticket): ep.phone = visitor.phone ep.photo = visitor.photo ep.type = 'visitor' + ep.belong_dept = visit.receptionist ep.save() visitor.employee = ep visitor.visit = visit # 更新当前所属访客项目