From 00fb5f90bfb7c05b03a469808bcce230ca222661 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 24 Sep 2021 16:44:16 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/company/controller/CompanyLoginController.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 68e61351..b0fd5b0b 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 @@ -190,6 +190,9 @@ public class CompanyLoginController { BeanUtils.copyProperties(contactsManagement, loginUser); baseCommonService.addLog("用户名: " + phone + ",登录成功！", CommonConstant.LOG_TYPE_1, null, loginUser); //update-end--Author:wangshuai Date:20200714 for：登录日志没有记录人员 + if (Objects.isNull(contactsManagement.getPassword())){ + result.setMessage("updatePassword"); + } return result; } @@ -264,11 +267,7 @@ public class CompanyLoginController { } sysBaseAPI.sendVerificationCode(phone,"2",null,null); String string = redisUtil.get("_verification:_phone:" + PasswordUtil.decrypt(phone)).toString(); - if (Objects.isNull(contactsManagement.getPassword())){ - return Result.error(string+"updatePassword"); - }else { - return Result.OK(string); - } + return Result.OK(string); } @ApiOperation(value = "短信验证码修改密码")