diff --git a/pom.xml b/pom.xml index 450d94aca..29c4bd132 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.70 + 1.2.71 UTF-8 1.6.1 diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 16d9a65e3..a137baf6f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -1557,7 +1557,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new InvalidShortIdException(); } checkOrgPermission(manager, client); - checkPhoneAndWechatExist(account); + if (StringUtils.isNotBlank(account.getContactPhone())) { + checkPhoneAndWechatExist(account); + } JSONObject accountJson = account.toJson(); JSONObject accountCheck = clientAccountMapper.findByUsernameForDuplicate(accountJson.getString("username")); if (accountCheck != null) { @@ -1579,7 +1581,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } private void checkPhoneAndWechatExist(NewAccountBean account) { - if (clientAccountMapper.findByPhone(account.getContactPhone(), "+" + account.getNation_code()) != null) { + if (clientAccountMapper.findByPhone(account.getContactPhone(), account.getNation_code().startsWith("+")?account.getNation_code():"+"+account.getNation_code()) != null) { throw new BadRequestException("Mobile phone number has been bound to other accounts"); } }