Bladeren bron

修改员工

wushaodong 4 jaren geleden
bovenliggende
commit
49046216c5
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 2 2
      apps/tenant/employee/models.py
  2. 2 2
      apps/tenant/employee/serializers.py

+ 2 - 2
apps/tenant/employee/models.py

@@ -98,8 +98,8 @@ class Employee(models.Model):
 
     @staticmethod
     def checkEmployee(tenant, id=None):
-        #  检查超级管理员数量
+        # 标准版 限制检修人人数为2
         rows = Employee.objects.filter(type=Employee.EMPLOYEE, tenant=tenant)
         if id:
             rows = rows.exclude(id=id)
-        return rows.count()
+        return rows.count() >=2 and tenant.edition < Tenant.EDITION_3

+ 2 - 2
apps/tenant/employee/serializers.py

@@ -26,7 +26,7 @@ class EmployeeSerializer(serializers.ModelSerializer):
             raise CustomError(u'已存在一个平台管理员,禁止操作!')
         #标准版 限制检修人人数为2
         tenant = self.context['request'].user.employee.tenant
-        if int(self.initial_data['type']) == Employee.EMPLOYEE and Employee.checkEmployee(self.context['request'].user.employee.tenant) and tenant.edition == Tenant.EDITION_1:
+        if int(self.initial_data['type']) == Employee.EMPLOYEE and Employee.checkEmployee(self.context['request'].user.employee.tenant):
             raise CustomError(u'当前版本,仅能添加2个检修人。如有需要,请升级到更高版本!')
         # 判断用户是否已经注册登陆过
         password = None
@@ -55,7 +55,7 @@ class EmployeeSerializer(serializers.ModelSerializer):
         if int(self.initial_data['type']) == Employee.SUPER and Employee.checkSuper(instance.tenant, instance.id):
             raise CustomError(u'已存在一个平台管理员,禁止操作!')
         # 标准版 限制检修人人数为2
-        if int(self.initial_data['type']) == Employee.EMPLOYEE and Employee.checkEmployee(instance.tenant, instance.id) and instance.tenant.edition == Tenant.EDITION_1:
+        if int(self.initial_data['type']) == Employee.EMPLOYEE and Employee.checkEmployee(instance.tenant, instance.id):
             raise CustomError(u'当前版本,仅能添加2个检修人。如有需要,请升级到更高版本!')
 
         username = self.initial_data['tel']