From 9a37bd771fb250a313e56e4b023605fd954d4741 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Nov 2021 17:55:39 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=99=BB=E5=BD=95=E5=B0=B1=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=BE=AE=E4=BF=A1=EF=BC=8C=E5=B9=B6=E8=A7=A3=E7=BB=91?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/controller/CompanyLoginController.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index cbdcf77d..44edd106 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -259,14 +259,15 @@ public class CompanyLoginController { LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(PayContactsManagement::getOpenId, PasswordUtil.encrypt(openId)); PayContactsManagement contactsManagement1 = payContactsManagementService.getOne(queryWrapper1); - //没有绑定过就绑定 - if (contactsManagement1 == null){ - contactsManagement.setOpenId(PasswordUtil.encrypt(openId)); + //绑定过就解绑重新绑定 + if (contactsManagement1 != null){ + contactsManagement1.setOpenId(null); payContactsManagementService.updateById(contactsManagement); - //绑定过就判断是否是当前用户,如果不是就报错 - }else if (!Objects.equals(contactsManagement1.getPhone(),contactsManagement.getPhone())){ - throw new JeroBootException("微信已经绑定过其他账号"); } + //绑定微信 + contactsManagement.setOpenId(PasswordUtil.encrypt(openId)); + payContactsManagementService.updateById(contactsManagement); + baseCommonService.addLog("手机号: " + PasswordUtil.decrypt(contactsManagement.getPhone()) + ",绑定微信成功！", CommonConstant.LOG_TYPE_2, CommonConstant.OPERATE_TYPE_3, loginUser); //update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员 return Result.OK("绑定微信成功");