From d0551146ec90f23b38dc10becfa5b961e347d620 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Wed, 27 Nov 2019 15:51:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=85=88=E8=A7=A3=E7=BB=91=E6=97=A7=E5=B8=90=E6=88=B7=E5=86=8D?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=96=B0=E8=B4=A6=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/SysUserServiceImpl.java     | 10 ++++++++++
 .../com/elink/esua/epdc/controller/AuthController.java |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
index 954de6d52..2952e9ba1 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
@@ -221,6 +221,16 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
     @Override
     public Result modifyOpenIdByUsername(SysUserOpenIdFormDTO sysUserOpenIdFormDto) {
+        // 查询当前openId是否绑定过账户
+        SysUserDTO userDto = this.getSysUserInfoByOpenId(sysUserOpenIdFormDto.getOpenId());
+        if (null != userDto) {
+            // 解绑旧帐户
+            SysUserEntity entity = new SysUserEntity();
+            entity.setId(userDto.getId());
+            entity.setOpenId("");
+            baseDao.updateById(entity);
+        }
+        // 绑定新账户
         baseDao.updateOpenIdByUsername(sysUserOpenIdFormDto);
 
         return new Result();
diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
index d1a598bff..15ed691b7 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java
@@ -119,7 +119,7 @@ public class AuthController {
         ValidatorUtils.validateEntity(workUserLoginDto);
         Result<WorkUserAuthorizationDTO> result = authService.workLogin(workUserLoginDto.getUsername(), workUserLoginDto.getPassword());
         if (result.success()) {
-            // 更新用户openId
+            // 解绑上一次登录账户并绑定当前账户
             SysUserOpenIdFormDTO sysUserOpenIdFormDto = ConvertUtils.sourceToTarget(workUserLoginDto, SysUserOpenIdFormDTO.class);
             authService.modifyOpenId(sysUserOpenIdFormDto);
         }