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