|
@@ -310,13 +310,16 @@ class UserManagement(View):
|
|
|
elif operation == 'doDelete':
|
|
|
return self.doDelete(userID, request_dict, response)
|
|
|
elif operation == 'resetPassword':
|
|
|
- return self.resetPassword(userID, request_dict, response)
|
|
|
+ return self.resetPassword(request_dict, response)
|
|
|
else:
|
|
|
return response.json(404)
|
|
|
|
|
|
def getUserInfo(self, userID, request_dict, response):
|
|
|
print('request_dict: ', request_dict)
|
|
|
username = request_dict.get('username', '').strip() # 移除字符串头尾的空格
|
|
|
+ NickName = request_dict.get('NickName', '').strip()
|
|
|
+ phone = request_dict.get('phone', '').strip()
|
|
|
+ userEmail = request_dict.get('userEmail', '').strip()
|
|
|
pageNo = request_dict.get('pageNo', None)
|
|
|
pageSize = request_dict.get('pageSize', None)
|
|
|
|
|
@@ -326,19 +329,18 @@ class UserManagement(View):
|
|
|
page = int(pageNo)
|
|
|
line = int(pageSize)
|
|
|
try:
|
|
|
- if username: # 查询
|
|
|
- # 校验查询输入数据是否匹配用户名,手机或邮箱正则
|
|
|
- dataValid = DataValid()
|
|
|
- if not (dataValid.name_validate(username) or dataValid.mobile_validate(username) \
|
|
|
- or dataValid.email_validate(username)):
|
|
|
- return response.json(444)
|
|
|
- device_user_qs = Device_User.objects.filter(username=username)
|
|
|
+ if username or NickName or phone or userEmail:
|
|
|
+ # 条件查询
|
|
|
+ if username:
|
|
|
+ device_user_qs = Device_User.objects.filter(username__contains=username)
|
|
|
+ if NickName:
|
|
|
+ device_user_qs = Device_User.objects.filter(NickName__contains=NickName)
|
|
|
+ if phone:
|
|
|
+ device_user_qs = Device_User.objects.filter(phone__contains=phone)
|
|
|
+ if userEmail:
|
|
|
+ device_user_qs = Device_User.objects.filter(userEmail__contains=userEmail)
|
|
|
if not device_user_qs.exists():
|
|
|
- device_user_qs = Device_User.objects.filter(phone=username)
|
|
|
- if not device_user_qs.exists():
|
|
|
- device_user_qs = Device_User.objects.filter(userEmail=username)
|
|
|
- if not device_user_qs.exists():
|
|
|
- return response.json(104)
|
|
|
+ return response.json(0)
|
|
|
|
|
|
else:
|
|
|
device_user_qs = Device_User.objects.filter() # 查询全部
|
|
@@ -428,7 +430,7 @@ class UserManagement(View):
|
|
|
Device_User.objects.filter(userID=userID).delete()
|
|
|
return response.json(0)
|
|
|
|
|
|
- def resetPassword(self, userID, request_dict, response):
|
|
|
+ def resetPassword(self, request_dict, response):
|
|
|
userID = request_dict.get('userID', None)
|
|
|
if not userID:
|
|
|
return response.json(444)
|