update
2 changed files with 7 additions and 1 deletions
+ 3
- 1
account/models.py
@@ -151,7 +151,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin): |
||
| 151 | 151 |
identity_card_number = models.CharField(_(u'identity_card_number'), max_length=32, blank=True, null=True, help_text=u'身份证号') |
| 152 | 152 |
identity_card_name = models.CharField(_(u'identity_card_name'), max_length=32, blank=True, null=True, help_text=u'身份证姓名') |
| 153 | 153 |
|
| 154 |
- #租用镜头权限 |
|
| 154 |
+ # 租用镜头权限 |
|
| 155 | 155 |
tenancy_shot_permission = models.BooleanField(_(u'tenancy_shot_permission'), default=False, help_text=u'租用镜头权限') |
| 156 | 156 |
|
| 157 | 157 |
class Meta: |
@@ -329,6 +329,8 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin): |
||
| 329 | 329 |
'integral': self.integral, |
| 330 | 330 |
'shots_num': self.shots_num, |
| 331 | 331 |
'level': self.level, |
| 332 |
+ |
|
| 333 |
+ 'tenancy_shot_permission': self.tenancy_shot_permission, |
|
| 332 | 334 |
} |
| 333 | 335 |
|
| 334 | 336 |
@property |
+ 4
- 0
api/admin_views.py
@@ -176,6 +176,7 @@ def query_userinfo(request, administrator): |
||
| 176 | 176 |
sex = request.POST.get('sex', '')
|
| 177 | 177 |
subscribe = request.POST.get('subscribe', '')
|
| 178 | 178 |
has_membercard = request.POST.get('has_membercard', '')
|
| 179 |
+ tenancy_shot_permission = request.POST.get('tenancy_shot_permission', '')
|
|
| 179 | 180 |
province = request.POST.get('province', '')
|
| 180 | 181 |
start_time = request.POST.get('start_time', '')
|
| 181 | 182 |
end_time = request.POST.get('end_time', '')
|
@@ -204,6 +205,9 @@ def query_userinfo(request, administrator): |
||
| 204 | 205 |
|
| 205 | 206 |
if province: |
| 206 | 207 |
userinfos = userinfos.filter(province_name=province) |
| 208 |
+ |
|
| 209 |
+ if tenancy_shot_permission != '': |
|
| 210 |
+ userinfos = userinfos.filter(tenancy_shot_permission=tenancy_shot_permission) |
|
| 207 | 211 |
|
| 208 | 212 |
if start_time and end_time: |
| 209 | 213 |
ftime = datetime.strptime(start_time + ' 00:00:00', '%Y%m%d %H:%M:%S') |