PC查询

Controller/PcInfo.py

@@ -173,17 +173,15 @@ class PcInfo(View):
         pc_name = request_dict.get('pc_name', None)
         package = request_dict.get('package', None)
         file_type = request_dict.get('file_type', None)
-        q = Pc_Info.objects.filter(file_type=file_type).filter(package=package)
-        print(q)
-        if package is None and file_type is None:
+        if package is None and file_type is None and pc_name is None:
             queryset = Pc_Info.objects.all()
-        elif package and file_type is None:
+        elif package and file_type is None and pc_name is None:
             queryset = Pc_Info.objects.filter(package=package)
-        elif file_type and package is None:
+        elif file_type and package is None and pc_name is None:
             queryset = Pc_Info.objects.filter(file_type=file_type)
-        elif pc_name and file_type:
+        elif pc_name and file_type and package is None:
             queryset = Pc_Info.objects.filter(pc_name=pc_name).filter(file_type=file_type)
-        elif file_type and package:
+        elif file_type and package and pc_name is None:
             queryset = Pc_Info.objects.filter(file_type=file_type).filter(package=package)
         count = queryset.count()
         res = queryset