|
|
@@ -122,9 +122,9 @@ class VPGView(View):
|
|
|
return response.json(444)
|
|
|
|
|
|
def do_list(self, userID, request_dict, response):
|
|
|
- perm = ModelService.check_perm_uid_manage(userID, 0)
|
|
|
- if not perm:
|
|
|
- return response.json(309)
|
|
|
+ # perm = ModelService.check_perm_uid_manage(userID, 0)
|
|
|
+ # if not perm:
|
|
|
+ # return response.json(309)
|
|
|
|
|
|
company_id = request_dict.get('company_id', None)
|
|
|
region_id = request_dict.get('region_id', None)
|
|
|
@@ -147,8 +147,9 @@ class VPGView(View):
|
|
|
vpg_qs.filter(region_id=region_id)
|
|
|
|
|
|
count = vpg_qs.count()
|
|
|
+ vpg_qs = vpg_qs.values('id', 'name', 'region__name', 'region_id', 'company__name', 'add_time',
|
|
|
+ 'update_time', 'company__secret')
|
|
|
vpg_qs = vpg_qs[start: end]
|
|
|
- vpg_qs = vpg_qs.values('id', 'name', 'region__name', 'region_id', 'company__name', 'add_time', 'update_time', 'company__secret')
|
|
|
for vpg in vpg_qs:
|
|
|
vpg['uid_count'] = UIDModel.objects.filter(vpg_id=vpg['id']).count()
|
|
|
|
