v1.0.0: 希姆计算资产管理系统正式版

assetapp/views.py

@@ -99,7 +99,9 @@ def asset_list(request):
             Q(brand__icontains=search) |
             Q(model__icontains=search) |
             Q(location__icontains=search) |
-            Q(responsible_person__icontains=search)
+            Q(responsible_person__icontains=search) |
+            Q(department__icontains=search) |
+            Q(user__icontains=search)
         )
 
     # 筛选
@@ -116,8 +118,8 @@ def asset_list(request):
         queryset = queryset.filter(location__icontains=location)
 
     # 排序
-    sort = request.GET.get('sort', '-created_at')
-    valid_sorts = ['asset_number', '-asset_number', 'name', '-name',
+    sort = request.GET.get('sort', 'id')
+    valid_sorts = ['id', '-id', 'asset_number', '-asset_number', 'name', '-name',
                    'created_at', '-created_at', 'updated_at', '-updated_at',
                    'purchase_date', '-purchase_date']
     if sort not in valid_sorts: