zcdsj
/
examtest
mirror of https://e.coding.net/ctcdevteam/examtest.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crm consumer

This commit is contained in:
caoqianming 2020-07-20 21:58:45 +08:00
parent 2c61c68900
commit 28a36543d1
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test_server/crm/models.py
View File

@ -49,7 +49,7 @@ class ConsumerRole(CommonModel):
def __str__(self):
return self.name
class Consumer(SoftCommonModel):
class Consumer(CommonModel):
'''
学员
'''

5
test_server/crm/views.py
View File

@ -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()