diff --git a/test_server/crm/models.py b/test_server/crm/models.py index af51217..7880d23 100644 --- a/test_server/crm/models.py +++ b/test_server/crm/models.py @@ -49,7 +49,7 @@ class ConsumerRole(CommonModel): def __str__(self): return self.name -class Consumer(SoftCommonModel): +class Consumer(CommonModel): ''' 学员 ''' diff --git a/test_server/crm/views.py b/test_server/crm/views.py index 7da90d3..657b9f1 100644 --- a/test_server/crm/views.py +++ b/test_server/crm/views.py @@ -110,7 +110,7 @@ class ConsumerViewSet(ModelViewSet): perms_map = [ {'get': 'consumer_list'}, {'post': 'consumer_create'}, {'put': 'consumer_update'}, {'delete': 'consumer_delete'}] - queryset = Consumer.objects.filter(is_delete=0).all() + queryset = Consumer.objects.all() serializer_class = ConsumerSerializer pagination_class = CommonPagination ordering_fields = ('id','company','create_time', 'username', 'workscope') @@ -254,7 +254,6 @@ class ConsumerViewSet(ModelViewSet): obj.username = username obj.name = name obj.company = companyobj - obj.is_delete = False obj.save() if workscope: workscope = workscope.replace(' ', '') @@ -356,7 +355,6 @@ class ConsumerRegister(APIView): if avatar and nickname: consumer.avatar = avatar consumer.nickname = nickname - consumer.is_delete = False if consumer.role and consumer.role.name == '游客': consumer.role = ConsumerRole.objects.get(name='注册用户') consumer.save() @@ -367,7 +365,6 @@ class ConsumerRegister(APIView): if avatar and nickname: consumer.avatar = avatar consumer.nickname = nickname - consumer.is_delete = False if consumer.role and consumer.role.name == '游客': consumer.role = ConsumerRole.objects.get(name='注册用户') consumer.save()