From 866726704632917cb6c224009d15e401c62dee9d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 20 Nov 2024 13:18:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20equipment=20=E5=88=97=E8=A1=A8=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81is=5Fdeleted=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/em/models.py |  3 +--
 apps/em/views.py  | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/em/models.py b/apps/em/models.py
index 62f451db..85a2a69d 100644
--- a/apps/em/models.py
+++ b/apps/em/models.py
@@ -1,7 +1,6 @@
 from django.db import models
 from apps.utils.models import CommonBModel, CommonADModel
-from apps.system.models import User, Dictionary
-from enum import Enum
+from apps.system.models import User
 
 # Create your models here.
 
diff --git a/apps/em/views.py b/apps/em/views.py
index 2f4f98e2..439cf345 100644
--- a/apps/em/views.py
+++ b/apps/em/views.py
@@ -41,16 +41,16 @@ class EquipmentViewSet(CustomModelViewSet):
     设备列表
     """
 
-    queryset = Equipment.objects.all()
+    queryset = Equipment.objects.get_queryset(all=True)
     serializer_class = EquipmentSerializer
     select_related_fields = ["create_by", "belong_dept", "keeper", "mgroup"]
     search_fields = ["number", "name"]
     filterset_class = EquipFilterSet
 
-    # def filter_queryset(self, queryset):
-    #     if not self.detail and not self.request.query_params.get('type', None):
-    #         raise ParseError('请指定设备类型')
-    #     return super().filter_queryset(queryset)
+    def get_queryset(self):
+        if self.request.method == 'GET' and (not self.request.query_params.get('is_deleted', None)):
+            self.queryset = Equipment.objects.all()
+        return super().get_queryset()
 
     @action(methods=["post"], detail=False, perms_map={"post": "equipment.create"}, serializer_class=Serializer)
     @transaction.atomic