merge method updateuser if and fix bug#2892

fix [BUG] When editing user information, clear the phone number, the database table t_ds_user.phone is not cleared #2892
This commit is contained in:
小清 2020-06-04 16:26:26 +08:00 committed by GitHub
parent 4441d91dcf
commit 3e7dc7da8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -306,13 +306,11 @@ public class UsersService extends BaseService {
user.setEmail(email);
}
if (StringUtils.isNotEmpty(phone)) {
if (!CheckUtils.checkPhone(phone)){
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,phone);
return result;
}
user.setPhone(phone);
if (StringUtils.isNotEmpty(phone) && !CheckUtils.checkPhone(phone)) {
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,phone);
return result;
}
user.setPhone(phone);
user.setQueue(queue);
Date now = new Date();
user.setUpdateTime(now);