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

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory

This commit is contained in:
TianyangZhang 2025-12-22 13:41:40 +08:00
parent b250b9b078 725f7d1764
commit a408b2db92
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/em/views.py
View File

@ -202,7 +202,7 @@ class RepairViewSet(TicketMixin, CustomModelViewSet):
维修申请 维修申请
""" """
queryset = Repair.objects.all() queryset = Repair.objects.all()
create_serializer_class = RepairCreateSerializer serializer_class = RepairCreateSerializer
list_serializer_class = RepairListSerializer list_serializer_class = RepairListSerializer
retrieve_serializer_class = RepairListSerializer retrieve_serializer_class = RepairListSerializer
select_related_fields = ["equipment", "repair_user", "create_by"] select_related_fields = ["equipment", "repair_user", "create_by"]

12
apps/system/filters.py
View File

@ -1,6 +1,6 @@
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from .models import Dept, User from .models import Dept, User
from apps.utils.queryset import get_child_queryset_u from apps.utils.queryset import get_child_queryset2
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
@ -25,11 +25,17 @@ class UserFilterSet(filters.FilterSet):
} }
def filter_ubelong_dept__name(self, queryset, name, value): def filter_ubelong_dept__name(self, queryset, name, value):
depts = get_child_queryset_u(Dept.objects.filter(name=value)) try:
depts = get_child_queryset2(Dept.objects.get(name=value))
except Exception as e:
raise ParseError(f"部门名称错误: {value} {str(e)}")
return queryset.filter(belong_dept__in=depts) return queryset.filter(belong_dept__in=depts)
def filter_ubelong_dept(self, queryset, name, value): def filter_ubelong_dept(self, queryset, name, value):
depts = get_child_queryset_u(Dept.objects.filter(id=value)) try:
depts = get_child_queryset2(Dept.objects.get(id=value))
except Exception as e:
raise ParseError(f"部门ID错误: {value} {str(e)}")
return queryset.filter(belong_dept__in=depts) return queryset.filter(belong_dept__in=depts)