|
|
@@ -416,10 +416,10 @@ class UserManagement(View):
|
|
|
# 添加代理商字段
|
|
|
isAgent = request_dict.get('isAgent', None)
|
|
|
agent_company_name = request_dict.get('agent_company_name', None)
|
|
|
- agent_name = request_dict.get('agent_name', None)
|
|
|
+ card_name = request_dict.get('card_name', None)
|
|
|
card_no = request_dict.get('card_no', "")
|
|
|
card_address = request_dict.get('card_address', "")
|
|
|
- phone = request_dict.get('phone', "")
|
|
|
+ phone = request_dict.get('phone', None)
|
|
|
|
|
|
# 校验用户名,邮箱,密码是否符合规则
|
|
|
dataValid = DataValid()
|
|
|
@@ -452,7 +452,7 @@ class UserManagement(View):
|
|
|
role_qs = Role.objects.filter(roleName=roleName) # 账号角色
|
|
|
device_user_qs[0].role.set(role_qs)
|
|
|
else: # 添加用户
|
|
|
- if isAgent and not all([agent_company_name, agent_name, phone]):
|
|
|
+ if isAgent and not all([agent_company_name, card_name, phone]):
|
|
|
return response.json(444)
|
|
|
# 查询邮箱是否已注册
|
|
|
if Device_User.objects.filter(userEmail=userEmail).exists():
|
|
|
@@ -474,7 +474,7 @@ class UserManagement(View):
|
|
|
if isAgent:
|
|
|
agent_customer_info = AgentCustomerInfo.objects.create(user_id=new_userID, company_name=agent_company_name, status=1, created_time=int(time.time()),
|
|
|
updated_time=int(time.time()), created_by=userID, updated_by=userID)
|
|
|
- AgentCustomerCard.objects.create(ac_id=agent_customer_info.id, name=username, card_no=card_no, card_address=card_address, status=1,
|
|
|
+ AgentCustomerCard.objects.create(ac_id=agent_customer_info.id, name=card_name, card_no=card_no, card_address=card_address, status=1,
|
|
|
created_time=int(time.time()), updated_time=int(time.time()), created_by=userID, updated_by=userID)
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|
