diff --git a/pom.xml b/pom.xml
index f83275bae..e771bc0c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
4.0.0
manage
- 1.2.74
+ 1.2.75
UTF-8
1.6.1
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java
index 2005ca0fc..17081b797 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java
@@ -94,5 +94,9 @@ public interface ClientAccountMapper {
@AutoSql(type = SqlType.SELECT)
@AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "password_hash"})
- JSONObject findByWechatOpenId(@Param("wechat_openid")String openid);
+ List findByWechatOpenId(@Param("wechat_openid")String openid);
+
+ @AutoSql(type = SqlType.SELECT)
+ @AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "password_hash"})
+ List findByWechatUnionId(@Param("wx_unionid")String unionId);
}
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 5eac5ab73..edd5498f2 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,7 +1653,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
if (account == null) {
throw new BadRequestException("account not exists");
}
- if (clientAccountMapper.findByWechatOpenId(user.getString("openid")) != null || clientAccountMapper.findByWxUnioinId(user.getString("unioinid")) != null) {
+ if (clientAccountMapper.findByWechatOpenId(user.getString("openid")).size()>1 || clientAccountMapper.findByWechatUnionId(user.getString("unioinid")).size()>1) {
throw new BadRequestException("The WeChat has been linked to other accounts");
}
JSONObject res = new JSONObject();