Unverified Commit ae9afcf7 authored by gabry.wu's avatar gabry.wu Committed by GitHub
Browse files

Merge pull request #2898 from 597365581/patch-6

merge method updateuser if and fix bug#2892
parents 4441d91d 3e7dc7da
Loading
Loading
Loading
Loading
+4 −6
Original line number Diff line number Diff line
@@ -306,13 +306,11 @@ public class UsersService extends BaseService {
            user.setEmail(email);
        }

        if (StringUtils.isNotEmpty(phone)) {
            if (!CheckUtils.checkPhone(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);