From e2db33a0625a37ed3d5457b0400d8f3a0baedc14 Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Thu, 7 Nov 2019 14:33:59 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AB=AF=E5=BE=AE=E4=BF=A1=E7=BB=91=E5=AE=9A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=B7=B2=E7=BB=91=E5=AE=9A=E7=94=A8=E6=88=B7=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 2 +-
 .../payment/manage/mappers/system/ClientAccountMapper.java  | 6 +++++-
 .../manage/merchants/core/impls/ClientManagerImpl.java      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f83275bae..e771bc0c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.2.74</version>
+    <version>1.2.75</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.6.1</jib-maven-plugin.version>
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<JSONObject> findByWechatOpenId(@Param("wechat_openid")String openid);
+
+    @AutoSql(type = SqlType.SELECT)
+    @AdvanceSelect(addonWhereClause = "is_valid=1", excludeColumns = {"salt", "password_hash"})
+    List<JSONObject> 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();