|
@@ -376,14 +376,15 @@ class UserManagement(View):
|
|
password = request_dict.get('password', None)
|
|
password = request_dict.get('password', None)
|
|
isEdit = request_dict.get('isEdit', None)
|
|
isEdit = request_dict.get('isEdit', None)
|
|
|
|
|
|
- if not all([username, userEmail, roleName, password]):
|
|
|
|
- return response.json(444)
|
|
|
|
-
|
|
|
|
# 校验用户名,邮箱,密码是否符合规则
|
|
# 校验用户名,邮箱,密码是否符合规则
|
|
dataValid = DataValid()
|
|
dataValid = DataValid()
|
|
- if not dataValid.name_validate(username) or not dataValid.email_validate(userEmail) \
|
|
|
|
- or not dataValid.password_validate(password):
|
|
|
|
- return response.json(444)
|
|
|
|
|
|
+ if not username or not dataValid.name_validate(username):
|
|
|
|
+ return response.json(444, {'Parameter error': 'username'})
|
|
|
|
+ if userEmail and not dataValid.email_validate(userEmail):
|
|
|
|
+ return response.json(444, {'Parameter error': 'userEmail'})
|
|
|
|
+ if not isEdit: # 添加用户需要输入密码
|
|
|
|
+ if not password or not dataValid.password_validate(password):
|
|
|
|
+ return response.json(444, {'Parameter error': 'password'})
|
|
|
|
|
|
try:
|
|
try:
|
|
if isEdit: # 编辑用户信息
|
|
if isEdit: # 编辑用户信息
|