diff --git a/pom.xml b/pom.xml index dce5495b6..b822fce08 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.76 + 1.2.77 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 7734f5090..d1539284d 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 @@ -1653,8 +1653,15 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (account == null) { throw new BadRequestException("account not exists"); } - if (clientAccountMapper.findByWechatOpenId(user.getString("openid")).size()>0 || clientAccountMapper.findByWechatUnionId(user.getString("unioinid")).size()>0) { - throw new BadRequestException("The WeChat has been linked to other accounts"); + if(user.getString("openid")!=null && !"".equals(user.getString("openid"))) { + if (clientAccountMapper.findByWechatOpenId(user.getString("openid")).size() > 0) { + throw new BadRequestException("The WeChat has been linked to other accounts"); + } + } + if(user.getString("unioinid")!=null && !"".equals(user.getString("unioinid"))){ + if(clientAccountMapper.findByWechatUnionId(user.getString("unioinid")).size()>0 ){ + throw new BadRequestException("The WeChat has been linked to other accounts"); + } } JSONObject res = new JSONObject(); if (StringUtils.equals(user.getString("openid"), account.getString("wechat_openid"))) {