Merge remote-tracking branch 'origin/master'

Controller/SerialNumberController.py

@@ -404,6 +404,9 @@ class SerialNumberView(View):
         if not allot_user_qs.exists():
             return response.json(444, 'username')
 
+        if allot_user_qs[0].permission != '2':
+            return response.json(109)
+
         # 取出对应区域可用的UID分配给allot_user
         sn_qs = SerialNumberModel.objects.filter(use_status=3)[0:quantity]
         sns = []

Controller/UIDController.py

@@ -97,11 +97,12 @@ class UIDView(View):
         item['domestic'] = domestic
         item['foreign'] = foreign
         item['username'] = admin
+        item['permission'] = 0
         datas.append(item)
 
         user_qs = UserModel.objects.filter(~Q(Q(permission='0')))
         for user in user_qs:
-            item = {'isAdmin': 0}
+            item = {'isAdmin': 0, 'permission': user.permission}
             result = UserUIDModel.objects.filter(user__id=user.id, uid__status=1, uid__area=0).aggregate(num=Count('uid__status'))
             item['domestic'] = result['num']
             result = UserUIDModel.objects.filter(user__id=user.id, uid__status=1, uid__area=1).aggregate(num=Count('uid__status'))
@@ -117,7 +118,7 @@ class UIDView(View):
         if user_qs.exists():
             user = user_qs[0]
             datas = []
-            item = {'isAdmin': 0}
+            item = {'isAdmin': 0, 'permission': user.permission}
             result = UserUIDModel.objects.filter(user__id=user.id, uid__status=1, uid__area=0).aggregate(num=Count('uid__status'))
             item['domestic'] = result['num']
             result = UserUIDModel.objects.filter(user__id=user.id, uid__status=1, uid__area=1).aggregate(num=Count('uid__status'))
@@ -149,6 +150,9 @@ class UIDView(View):
         if not allot_user_qs.exists():
             return response.json(444, 'username')
 
+        if allot_user_qs[0].permission != '1':
+            return response.json(109)
+
         # 取出对应区域可用的UID分配给allot_user
         uid_qs = UIDModel.objects.filter(area=area, status=0)
         count = uid_qs.count()

Model/models.py

@@ -8,7 +8,7 @@ class UserModel(models.Model):
     id = models.AutoField(primary_key=True)
     username = models.CharField(unique=True, max_length=128, null=False, verbose_name='用户名')
     password = models.CharField(max_length=128, null=False, verbose_name='密码')
-    permission = models.CharField(max_length=24, null=False, verbose_name='权限')
+    permission = models.CharField(max_length=24, null=False, verbose_name='权限')  # 0：超级管理员；1：uid管理员；2：序列号管理员
     login_time = models.IntegerField(blank=True, default=0, verbose_name='登录时间')
     online = models.SmallIntegerField(default=0, verbose_name='是否在线')
     phone = models.CharField(max_length=11, default='', verbose_name='手机号')

Object/ResponseObject.py

@@ -35,6 +35,7 @@ class ResponseObject(object):
             104: '邮箱用户帐户不存在！',
             107: '用户名格式不符合规则！',
             108: '邮箱格式不符合规则！',
+            109: '该账号无法分配！',
             110: '因为用户未激活，用户是无效用户！',
             111: '您输入的密码不正确！',
             120: '验证码已过期或不存在、请重新获得验证码！',
@@ -76,6 +77,7 @@ class ResponseObject(object):
             104: 'The mailbox user account does not exist!',
             107: 'The username format does not conform to the rules!',
             108: 'The mailbox format does not conform to the rules! ',
+            109: 'The account cannot be allocated!',
             110: 'Because the user is not activated, the user is an invalid user!',
             111: 'The password you entered is incorrect！',
             120: 'The captcha has expired or does not exist, please obtain the captcha again!',