|
@@ -14,6 +14,7 @@ from rest_framework.decorators import action
|
|
from utils import response_ok, response_error
|
|
from utils import response_ok, response_error
|
|
from apps.account.models import User
|
|
from apps.account.models import User
|
|
from .filters import TenantFilter
|
|
from .filters import TenantFilter
|
|
|
|
+from apps.tenant.option.models import Option
|
|
|
|
|
|
class TenantViewSet(CustomModelViewSet):
|
|
class TenantViewSet(CustomModelViewSet):
|
|
permission_classes = [IsAdministratorUser, ]
|
|
permission_classes = [IsAdministratorUser, ]
|
|
@@ -52,7 +53,21 @@ class TenantViewSet(CustomModelViewSet):
|
|
user.save()
|
|
user.save()
|
|
Employee.objects.filter(user=user).update(tenant=tenant, type=Employee.SUPER)
|
|
Employee.objects.filter(user=user).update(tenant=tenant, type=Employee.SUPER)
|
|
else:
|
|
else:
|
|
- Employee.create_super_admin(tenant, name, username, password)
|
|
|
|
|
|
+ user = Employee.create_super_admin(tenant, name, username, password)
|
|
|
|
+ option_data1 = {
|
|
|
|
+ 'tenant': tenant,
|
|
|
|
+ 'type': 1,
|
|
|
|
+ 'name': u'桌椅、板凳',
|
|
|
|
+ 'create_user': user,
|
|
|
|
+ }
|
|
|
|
+ option_data2 = {
|
|
|
|
+ 'tenant': tenant,
|
|
|
|
+ 'type': 2,
|
|
|
|
+ 'name': u'设备老化',
|
|
|
|
+ 'create_user': user,
|
|
|
|
+ }
|
|
|
|
+ Option.objects.create(**option_data1)
|
|
|
|
+ Option.objects.create(**option_data2)
|
|
admin_log(request.user, BizLog.INSERT, u'企业[%s]添加超级账号[%s]' % (tenant.company_name,username))
|
|
admin_log(request.user, BizLog.INSERT, u'企业[%s]添加超级账号[%s]' % (tenant.company_name,username))
|
|
return response_ok()
|
|
return response_ok()
|
|
except CustomError as e:
|
|
except CustomError as e:
|