account/models.py

@@ -151,7 +151,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                     identity_card_number = models.CharField(_(u'identity_card_number'), max_length=32, blank=True, null=True, help_text=u'身份证号')
              

                     identity_card_name = models.CharField(_(u'identity_card_name'), max_length=32, blank=True, null=True, help_text=u'身份证姓名')
              

                 
              

                -    #租用镜头权限
              

                +    # 租用镜头权限
              

                     tenancy_shot_permission = models.BooleanField(_(u'tenancy_shot_permission'), default=False, help_text=u'租用镜头权限')
              

                 
              

                     class Meta:
              
@@ -329,6 +329,8 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                             'integral': self.integral,
              

                             'shots_num': self.shots_num,
              

                             'level': self.level,
              

                +
              

                +            'tenancy_shot_permission': self.tenancy_shot_permission,
              

                         }
              

                 
              

                     @property
              

api/admin_views.py

@@ -176,6 +176,7 @@ def query_userinfo(request, administrator):

                     sex = request.POST.get('sex', '')
              

                     subscribe = request.POST.get('subscribe', '')
              

                     has_membercard = request.POST.get('has_membercard', '')
              

                +    tenancy_shot_permission = request.POST.get('tenancy_shot_permission', '')
              

                     province = request.POST.get('province', '')
              

                     start_time = request.POST.get('start_time', '')
              

                     end_time = request.POST.get('end_time', '')
              
@@ -204,6 +205,9 @@ def query_userinfo(request, administrator):

                 
              

                     if province:
              

                         userinfos = userinfos.filter(province_name=province)
              

                +    
              

                +    if tenancy_shot_permission != '':
              

                +        userinfos = userinfos.filter(tenancy_shot_permission=tenancy_shot_permission)
              

                 
              

                     if start_time and end_time:
              

                         ftime = datetime.strptime(start_time + ' 00:00:00', '%Y%m%d %H:%M:%S')